Merge pull request #60 from moiseev/swift-3-api-guidelines

Migrating to Swift 3
apple · Mar 10, 2016 · d28cbd6 · d28cbd6
2 parents b2d5fb0 + 78d5a02
commit d28cbd6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/Sources/XCTest/XCTAssert.swift b/Sources/XCTest/XCTAssert.swift
@@ -49,7 +49,7 @@ private enum _XCTAssertion {
 private enum _XCTAssertionResult {
  case Success
  case ExpectedFailure(String?)
- case UnexpectedFailure(ErrorType)
+ case UnexpectedFailure(ErrorProtocol)
 
  var expected: Bool {
  switch (self) {
@@ -155,7 +155,7 @@ private func _XCTEvaluateAssertion(assertion: _XCTAssertion, @autoclosure messag
 ///
 /// Now calling failures in `AssertEmpty` will be reported in the file and on
 /// the line that the assert function is *called*, not where it is defined.
-public func XCTAssert(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssert(@autoclosure expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
  XCTAssertTrue(expression, message, file: file, line: line)
 }
 
@@ -214,18 +214,18 @@ public func XCTAssertEqual<T, U: Equatable>(@autoclosure expression1: () throws
  }
 }
 
-public func XCTAssertEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
  _XCTEvaluateAssertion(.EqualWithAccuracy, message: message, file: file, line: line) {
  let (value1, value2) = (try expression1(), try expression2())
- if abs(value1.distanceTo(value2)) <= abs(accuracy.distanceTo(T(0))) {
+ if abs(value1.distance(to: value2)) <= abs(accuracy.distance(to: T(0))) {
  return .Success
  } else {
  return .ExpectedFailure("(\"\(value1)\") is not equal to (\"\(value2)\") +/- (\"\(accuracy)\")")
  }
  }
 }
 
-public func XCTAssertFalse(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertFalse(@autoclosure expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
  _XCTEvaluateAssertion(.False, message: message, file: file, line: line) {
  let value = try expression()
  if !value.boolValue {
@@ -346,10 +346,10 @@ public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure expression1: () thro
  }
 }
 
-public func XCTAssertNotEqualWithAccuracy<T: FloatingPointType>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
  _XCTEvaluateAssertion(.NotEqualWithAccuracy, message: message, file: file, line: line) {
  let (value1, value2) = (try expression1(), try expression2())
- if abs(value1.distanceTo(value2)) > abs(accuracy.distanceTo(T(0))) {
+ if abs(value1.distance(to: value2)) > abs(accuracy.distance(to: T(0))) {
  return .Success
  } else {
  return .ExpectedFailure("(\"\(value1)\") is equal to (\"\(value2)\") +/- (\"\(accuracy)\")")
@@ -368,7 +368,7 @@ public func XCTAssertNotNil(@autoclosure expression: () throws -> Any?, @autoclo
  }
 }
 
-public func XCTAssertTrue(@autoclosure expression: () throws -> BooleanType, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertTrue(@autoclosure expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
  _XCTEvaluateAssertion(.True, message: message, file: file, line: line) {
  let value = try expression()
  if value.boolValue {
@@ -385,9 +385,9 @@ public func XCTFail(message: String = "", file: StaticString = #file, line: UInt
  }
 }
 
-public func XCTAssertThrowsError<T>(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorType) -> Void = { _ in }) {
+public func XCTAssertThrowsError<T>(@autoclosure expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorProtocol) -> Void = { _ in }) {
  _XCTEvaluateAssertion(.ThrowsError, message: message, file: file, line: line) {
- var caughtErrorOptional: ErrorType?
+ var caughtErrorOptional: ErrorProtocol?
  do {
  _ = try expression()
  } catch {

diff --git a/Sources/XCTest/XCTestCase.swift b/Sources/XCTest/XCTestCase.swift
@@ -264,7 +264,7 @@ extension XCTestCase {
  if unfulfilledDescriptions.count > 0 {
  // Not all expectations were fulfilled. Append a failure
  // to the array of expectation-based failures.
- let descriptions = unfulfilledDescriptions.joinWithSeparator(", ")
+ let descriptions = unfulfilledDescriptions.joined(separator: ", ")
  let failure = XCTFailure(
  message: "Exceeded timeout of \(timeout) seconds, with unfulfilled expectations: \(descriptions)",
  failureDescription: "Asynchronous wait failed",

diff --git a/Sources/XCTest/XCTimeUtilities.swift b/Sources/XCTest/XCTimeUtilities.swift
@@ -24,7 +24,7 @@ private func currentTimeIntervalSinceReferenceTime() -> TimeInterval {
  var tv = timeval()
  let currentTime = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> TimeInterval in
  gettimeofday(t, nil)
- return TimeInterval(t.memory.tv_sec) + TimeInterval(t.memory.tv_usec) / 1000000.0
+ return TimeInterval(t.pointee.tv_sec) + TimeInterval(t.pointee.tv_usec) / 1000000.0
  })
  return currentTime
 }

diff --git a/Tests/Functional/ErrorHandling/main.swift b/Tests/Functional/ErrorHandling/main.swift
@@ -28,7 +28,7 @@ class ErrorHandling: XCTestCase {
  func functionThatDoesNotThrowError() throws {
  }
 
- enum SomeError: ErrorType {
+ enum SomeError: ErrorProtocol {
  case AnError(String)
  }
 

diff --git a/XCTest.xcodeproj/project.pbxproj b/XCTest.xcodeproj/project.pbxproj
@@ -186,6 +186,7 @@
  5B5D86D21BBC74AD00234F36 /* Project object */ = {
  isa = PBXProject;
  attributes = {
+ LastSwiftMigration = 0730;
  LastSwiftUpdateCheck = 0710;
  LastUpgradeCheck = 0710;
  ORGANIZATIONNAME = Apple;