Merge pull request #198 from briancroom/swift4-API-compatibility
[SR-5643] Adopt Swift 4 API adjustments from Apple XCTest
diff --git a/Sources/XCTest/Private/TestFiltering.swift b/Sources/XCTest/Private/TestFiltering.swift
index 4c5274d..daa2eeb 100644
--- a/Sources/XCTest/Private/TestFiltering.swift
+++ b/Sources/XCTest/Private/TestFiltering.swift
@@ -54,7 +54,7 @@
private extension SelectedTest {
init?(selectedTestName: String) {
- let components = selectedTestName.characters.split(separator: "/").map(String.init)
+ let components = selectedTestName.split(separator: "/").map(String.init)
switch components.count {
case 1:
testCaseClassName = components[0]
diff --git a/Sources/XCTest/Private/TestListing.swift b/Sources/XCTest/Private/TestListing.swift
index adb5a9e..2d32092 100644
--- a/Sources/XCTest/Private/TestListing.swift
+++ b/Sources/XCTest/Private/TestListing.swift
@@ -47,7 +47,7 @@
private func moduleName(value: Any) -> String {
let moduleAndType = String(reflecting: type(of: value))
- return String(moduleAndType.characters.split(separator: ".").first!)
+ return String(moduleAndType.split(separator: ".").first!)
}
extension XCTestSuite: Listable {
@@ -87,15 +87,14 @@
extension XCTestCase: Listable {
func list() -> [String] {
- let adjustedName = name.characters
- .split(separator: ".")
+ let adjustedName = name.split(separator: ".")
.map(String.init)
.joined(separator: "/")
return ["\(moduleName(value: self)).\(adjustedName)"]
}
func dictionaryRepresentation() -> NSDictionary {
- let methodName = String(name.characters.split(separator: ".").last!)
+ let methodName = String(name.split(separator: ".").last!)
return NSDictionary(object: NSString(string: methodName), forKey: NSString(string: "name"))
}
}
