Merge pull request #141 from CodaFi/bundled-accessories

Updates for SE-0089

Author: tkremenek

Sources/XCTest/Private/PerformanceMeter.swift

@@ -118,7 +118,7 @@ public final class PerformanceMeter {
             let meter = PerformanceMeter(metrics: metrics, delegate: delegate, file: file, line: line)
             meter.measure(block)
         } catch let e {
-            delegate.recordAPIViolation(description: String(e), file: file, line: line)
+            delegate.recordAPIViolation(description: String(describing: e), file: file, line: line)
         }
     }
 
@@ -203,6 +203,6 @@ public final class PerformanceMeter {
 
     private func recordAPIViolation(_ error: Error, file: StaticString, line: UInt) {
         state = .measurementAborted
-        delegate.recordAPIViolation(description: String(error), file: file, line: line)
+        delegate.recordAPIViolation(description: String(describing: error), file: file, line: line)
     }
 }

Sources/XCTest/Private/TestListing.swift

@@ -63,7 +63,7 @@ extension XCTestSuite: Listable {
     }
 
     private var listingName: String {
-        if let childTestCase = tests.first as? XCTestCase, name == String(childTestCase.dynamicType) {
+        if let childTestCase = tests.first as? XCTestCase, name == String(describing: childTestCase.dynamicType) {
             return "\(moduleName(value: childTestCase)).\(name)"
         } else {
             return name

Sources/XCTest/Private/XCTestCaseSuite.swift

@@ -26,7 +26,7 @@ internal class XCTestCaseSuite: XCTestSuite {
     init(testCaseEntry: XCTestCaseEntry) {
         let testCaseClass = testCaseEntry.testCaseClass
         self.testCaseClass = testCaseClass
-        super.init(name: String(testCaseClass))
+        super.init(name: String(describing: testCaseClass))
 
         for (testName, testClosure) in testCaseEntry.allTests {
             let testCase = testCaseClass.init(name: testName, testClosure: testClosure)

Sources/XCTest/Public/XCTAssert.swift

@@ -90,7 +90,7 @@ private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclo
         if let currentTestCase = XCTCurrentTestCase {
             currentTestCase.recordFailure(
                 withDescription: "\(result.failureDescription(assertion)) - \(message())",
-                inFile: String(file),
+                inFile: String(describing: file),
                 atLine: line,
                 expected: result.isExpected)
         }

Sources/XCTest/Public/XCTestCase+Asynchronous.swift

@@ -85,7 +85,7 @@ public extension XCTestCase {
         if _allExpectations.count == 0 {
             recordFailure(
                 withDescription: "API violation - call made to wait without any expectations having been set.",
-                inFile: String(file),
+                inFile: String(describing: file),
                 atLine: line,
                 expected: false)
             return
@@ -129,7 +129,7 @@ public extension XCTestCase {
             let descriptions = unfulfilledDescriptions.joined(separator: ", ")
             recordFailure(
                 withDescription: "Asynchronous wait failed - Exceeded timeout of \(timeout) seconds, with unfulfilled expectations: \(descriptions)",
-                inFile: String(file),
+                inFile: String(describing: file),
                 atLine: line,
                 expected: true)
         }
@@ -248,7 +248,7 @@ internal extension XCTestCase {
         if expectations.count > 0 {
             recordFailure(
                 withDescription: "Failed due to unwaited expectations.",
-                inFile: String(expectations.last!.file),
+                inFile: String(describing: expectations.last!.file),
                 atLine: expectations.last!.line,
                 expected: false)
         }

Sources/XCTest/Public/XCTestCase+Performance.swift

@@ -151,7 +151,7 @@ public extension XCTestCase {
 extension XCTestCase: PerformanceMeterDelegate {
     internal func recordAPIViolation(description: String, file: StaticString, line: UInt) {
         recordFailure(withDescription: "API violation - \(description)",
-                      inFile: String(file),
+                      inFile: String(describing: file),
                       atLine: line,
                       expected: false)
     }
@@ -161,6 +161,6 @@ extension XCTestCase: PerformanceMeterDelegate {
     }
 
     internal func recordFailure(description: String, file: StaticString, line: UInt) {
-        recordFailure(withDescription: "failed: " + description, inFile: String(file), atLine: line, expected: true)
+        recordFailure(withDescription: "failed: " + description, inFile: String(describing: file), atLine: line, expected: true)
     }
 }

Sources/XCTest/Public/XCTestExpectation.swift

@@ -58,7 +58,7 @@ public class XCTestExpectation {
             if let testCase = XCTCurrentTestCase {
                 testCase.recordFailure(
                     withDescription: "API violation - multiple calls made to XCTestExpectation.fulfill() for \(description).",
-                    inFile: String(file),
+                    inFile: String(describing: file),
                     atLine: line,
                     expected: false)
             }