Skip to content

Commit

Permalink
[SR-1901] Remove workarounds for private symbols
Browse files Browse the repository at this point in the history
[SR-1901](https://bugs.swift.org/browse/SR-1901) has been fixed, we no
longer need these workarounds.
  • Loading branch information
modocache committed Sep 23, 2016
1 parent 01676a2 commit fbc1676
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 20 deletions.
7 changes: 1 addition & 6 deletions Sources/XCTest/Public/XCAbstractTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ open class XCTest {

/// The test run object that executed the test, an instance of
/// testRunClass. If the test has not yet been run, this will be nil.
/// - Note: FIXME: This property is meant to be `private(set)`. It is
/// publicly settable for now due to a Swift compiler bug on Linux. To
/// ensure compatibility of tests between swift-corelibs-xctest and Apple
/// XCTest, you should not set this property. See
/// https://bugs.swift.org/browse/SR-1129 for details.
open open(set) var testRun: XCTestRun? = nil
open private(set) var testRun: XCTestRun? = nil

/// The method through which tests are executed. Must be overridden by
/// subclasses.
Expand Down
11 changes: 3 additions & 8 deletions Sources/XCTest/Public/XCTestCase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,17 @@ open class XCTestCase: XCTest {
return _name
}
/// A private setter for the name of this test case.
/// - Note: FIXME: This property should be readonly, but currently has to
/// be publicly settable due to a Swift compiler bug on Linux. To ensure
/// compatibility of tests between swift-corelibs-xctest and Apple XCTest,
/// this property should not be modified. See
/// https://bugs.swift.org/browse/SR-1129 for details.
public var _name: String
private var _name: String

open override var testCaseCount: UInt {
return 1
}

/// The set of expectations made upon this test case.
final internal var _allExpectations = [XCTestExpectation]()
internal var _allExpectations = [XCTestExpectation]()

/// An internal object implementing performance measurements.
final internal var _performanceMeter: PerformanceMeter?
internal var _performanceMeter: PerformanceMeter?

open override var testRunClass: AnyClass? {
return XCTestCaseRun.self
Expand Down
7 changes: 1 addition & 6 deletions Sources/XCTest/Public/XCTestSuite.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@ open class XCTestSuite: XCTest {
return _name
}
/// A private setter for the name of this test suite.
/// - Note: FIXME: This property should be readonly, but currently has to
/// be publicly settable due to a Swift compiler bug on Linux. To ensure
/// compatibility of tests between swift-corelibs-xctest and Apple XCTest,
/// this property should not be modified. See
/// https://bugs.swift.org/browse/SR-1129 for details.
public let _name: String
private let _name: String

/// The number of test cases in this suite.
open override var testCaseCount: UInt {
Expand Down

0 comments on commit fbc1676

Please sign in to comment.