Skip to content

Commit 2df27c5

Browse files
committed
Merge pull request #82 from shingt/replace-shared
[XCTestObservation] Replace sharedTestObservationCenter with shared
2 parents f01b3e2 + 88ec002 commit 2df27c5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Sources/XCTest/XCTestCase.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extension XCTestCase {
8282
}
8383

8484
internal static func invokeTests(tests: [(String, XCTestCase throws -> Void)]) {
85-
let observationCenter = XCTestObservationCenter.sharedTestObservationCenter()
85+
let observationCenter = XCTestObservationCenter.shared()
8686

8787
var totalDuration = 0.0
8888
var totalFailures = 0

Sources/XCTest/XCTestMain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ internal struct XCTRun {
7979
/// - Parameter testCases: An array of test cases run, each produced by a call to the `testCase` function
8080
/// - seealso: `testCase`
8181
@noreturn public func XCTMain(testCases: [XCTestCaseEntry]) {
82-
let observationCenter = XCTestObservationCenter.sharedTestObservationCenter()
82+
let observationCenter = XCTestObservationCenter.shared()
8383
let testBundle = NSBundle.mainBundle()
8484
observationCenter.testBundleWillStart(testBundle)
8585

Sources/XCTest/XCTestObservationCenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class XCTestObservationCenter {
2727
private var observers = Set<ObjectWrapper<XCTestObservation>>()
2828

2929
/// Registration should be performed on this shared instance
30-
public class func sharedTestObservationCenter() -> XCTestObservationCenter {
30+
public class func shared() -> XCTestObservationCenter {
3131
return center
3232
}
3333

Tests/Functional/Observation/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Observer: XCTestObservation {
3939
}
4040

4141
let observer = Observer()
42-
XCTestObservationCenter.sharedTestObservationCenter().addTestObserver(observer)
42+
XCTestObservationCenter.shared().addTestObserver(observer)
4343

4444
class Observation: XCTestCase {
4545
static var allTests: [(String, Observation -> () throws -> Void)] {
@@ -72,7 +72,7 @@ class Observation: XCTestCase {
7272
XCTAssertEqual(observer.finishedTestCaseNames,["Observation.test_one"])
7373
XCTAssertEqual(observer.finishedBundlePaths.count, 0)
7474

75-
XCTestObservationCenter.sharedTestObservationCenter().removeTestObserver(observer)
75+
XCTestObservationCenter.shared().removeTestObserver(observer)
7676
}
7777

7878
// CHECK: Test Case 'Observation.test_three' started.
@@ -83,7 +83,7 @@ class Observation: XCTestCase {
8383
XCTAssertEqual(observer.finishedTestCaseNames,["Observation.test_one"])
8484
XCTAssertEqual(observer.finishedBundlePaths.count, 0)
8585

86-
XCTestObservationCenter.sharedTestObservationCenter().addTestObserver(observer)
86+
XCTestObservationCenter.shared().addTestObserver(observer)
8787
}
8888
}
8989

0 commit comments

Comments
 (0)