Skip to content

Commit 40c295a

Browse files
committed
Make XCTestObservationCenter.shared a class property instead of class function
This change was made in Xcode 9 as part of XCTest's Swiftification effort.
1 parent 2e5c2d7 commit 40c295a

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

Sources/XCTest/Public/XCTestCase+Performance.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ extension XCTestCase: PerformanceMeterDelegate {
157157
}
158158

159159
internal func recordMeasurements(results: String, file: StaticString, line: Int) {
160-
XCTestObservationCenter.shared().testCase(self, didMeasurePerformanceResults: results, file: file, line: line)
160+
XCTestObservationCenter.shared.testCase(self, didMeasurePerformanceResults: results, file: file, line: line)
161161
}
162162

163163
internal func recordFailure(description: String, file: StaticString, line: Int) {

Sources/XCTest/Public/XCTestCaseRun.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
open class XCTestCaseRun: XCTestRun {
1616
open override func start() {
1717
super.start()
18-
XCTestObservationCenter.shared().testCaseWillStart(testCase)
18+
XCTestObservationCenter.shared.testCaseWillStart(testCase)
1919
}
2020

2121
open override func stop() {
2222
super.stop()
23-
XCTestObservationCenter.shared().testCaseDidFinish(testCase)
23+
XCTestObservationCenter.shared.testCaseDidFinish(testCase)
2424
}
2525

2626
open override func recordFailure(withDescription description: String, inFile filePath: String?, atLine lineNumber: Int, expected: Bool) {
@@ -29,7 +29,7 @@ open class XCTestCaseRun: XCTestRun {
2929
inFile: filePath,
3030
atLine: lineNumber,
3131
expected: expected)
32-
XCTestObservationCenter.shared().testCase(
32+
XCTestObservationCenter.shared.testCase(
3333
testCase,
3434
didFailWithDescription: description,
3535
inFile: filePath,

Sources/XCTest/Public/XCTestMain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public func XCTMain(_ testCases: [XCTestCaseEntry]) -> Never {
8989
exit(0)
9090
case .run(selectedTestName: _):
9191
// Add a test observer that prints test progress to stdout.
92-
let observationCenter = XCTestObservationCenter.shared()
92+
let observationCenter = XCTestObservationCenter.shared
9393
observationCenter.addTestObserver(PrintObserver())
9494

9595
observationCenter.testBundleWillStart(testBundle)

Sources/XCTest/Public/XCTestObservationCenter.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111
// Notification center for test run progress events.
1212
//
1313

14+
private let _sharedCenter: XCTestObservationCenter = XCTestObservationCenter()
15+
1416
/// Provides a registry for objects wishing to be informed about progress
1517
/// during the course of a test run. Observers must implement the
1618
/// `XCTestObservation` protocol
1719
/// - seealso: `XCTestObservation`
1820
public class XCTestObservationCenter {
1921

20-
private static var center = XCTestObservationCenter()
2122
private var observers = Set<ObjectWrapper<XCTestObservation>>()
2223

2324
/// Registration should be performed on this shared instance
24-
public class func shared() -> XCTestObservationCenter {
25-
return center
25+
public class var shared: XCTestObservationCenter {
26+
return _sharedCenter
2627
}
2728

2829
/// Register an observer to receive future events during a test run. The order

Sources/XCTest/Public/XCTestSuiteRun.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ open class XCTestSuiteRun: XCTestRun {
3636

3737
open override func start() {
3838
super.start()
39-
XCTestObservationCenter.shared().testSuiteWillStart(testSuite)
39+
XCTestObservationCenter.shared.testSuiteWillStart(testSuite)
4040
}
4141

4242
open override func stop() {
4343
super.stop()
44-
XCTestObservationCenter.shared().testSuiteDidFinish(testSuite)
44+
XCTestObservationCenter.shared.testSuiteDidFinish(testSuite)
4545
}
4646

4747
/// The test run for each of the tests in this suite.

Tests/Functional/Observation/All/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Observer: XCTestObservation {
5050
}
5151

5252
let observer = Observer()
53-
XCTestObservationCenter.shared().addTestObserver(observer)
53+
XCTestObservationCenter.shared.addTestObserver(observer)
5454

5555
// CHECK: Test Suite 'Observation' started at \d+-\d+-\d+ \d+:\d+:\d+\.\d+
5656
class Observation: XCTestCase {
@@ -90,7 +90,7 @@ class Observation: XCTestCase {
9090
XCTAssertEqual(observer.finishedTestCaseNames,["Observation.test_one"])
9191
XCTAssertEqual(observer.finishedBundlePaths.count, 0)
9292

93-
XCTestObservationCenter.shared().removeTestObserver(observer)
93+
XCTestObservationCenter.shared.removeTestObserver(observer)
9494
}
9595

9696
// CHECK: Test Case 'Observation.test_three' started at \d+-\d+-\d+ \d+:\d+:\d+\.\d+
@@ -101,7 +101,7 @@ class Observation: XCTestCase {
101101
XCTAssertEqual(observer.finishedTestCaseNames,["Observation.test_one"])
102102
XCTAssertEqual(observer.finishedBundlePaths.count, 0)
103103

104-
XCTestObservationCenter.shared().addTestObserver(observer)
104+
XCTestObservationCenter.shared.addTestObserver(observer)
105105
}
106106
}
107107

Tests/Functional/Observation/Selected/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Observer: XCTestObservation {
3232
}
3333

3434
let observer = Observer()
35-
XCTestObservationCenter.shared().addTestObserver(observer)
35+
XCTestObservationCenter.shared.addTestObserver(observer)
3636

3737
class SkippedTestCase: XCTestCase {
3838
static var allTests = {

0 commit comments

Comments
 (0)