Skip to content

Commit 6d37f25

Browse files
JhonnyBillMaciidgh
authored andcommitted
[SR-8459] fix --generate-linuxmain when testing subclasses (#1722)
* [SR-8459] replace '__allTests' by '__className' to fix --generate-linuxmain * Replace '__<className>' by '__allTests__<className>'
1 parent 1fd8217 commit 6d37f25

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Sources/Commands/GenerateLinuxMain.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class LinuxMainGenerator {
6262
for klass in module.classes.lazy.sorted(by: { $0.name < $1.name }) {
6363
stream <<< "\n"
6464
stream <<< "extension " <<< klass.name <<< " {" <<< "\n"
65-
stream <<< indent(4) <<< "static let __allTests = [" <<< "\n"
65+
stream <<< indent(4) <<< "static let __allTests__\(klass.name) = [" <<< "\n"
6666
for method in klass.methods {
6767
stream <<< indent(8) <<< "(\"\(method)\", \(method))," <<< "\n"
6868
}
@@ -79,7 +79,7 @@ final class LinuxMainGenerator {
7979
"""
8080

8181
for klass in module.classes {
82-
stream <<< indent(8) <<< "testCase(" <<< klass.name <<< ".__allTests)," <<< "\n"
82+
stream <<< indent(8) <<< "testCase(" <<< klass.name <<< ".__allTests__\(klass.name))," <<< "\n"
8383
}
8484

8585
stream <<< """

Tests/FunctionalTests/MiscellaneousTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,22 +405,22 @@ class MiscellaneousTestCase: XCTestCase {
405405
import XCTest
406406
407407
extension ParallelTestsFailureTests {
408-
static let __allTests = [
408+
static let __allTests__ParallelTestsFailureTests = [
409409
("testSureFailure", testSureFailure),
410410
]
411411
}
412412
413413
extension ParallelTestsTests {
414-
static let __allTests = [
414+
static let __allTests__ParallelTestsTests = [
415415
("testExample1", testExample1),
416416
("testExample2", testExample2),
417417
]
418418
}
419419
420420
public func __allTests() -> [XCTestCaseEntry] {
421421
return [
422-
testCase(ParallelTestsFailureTests.__allTests),
423-
testCase(ParallelTestsTests.__allTests),
422+
testCase(ParallelTestsFailureTests.__allTests__ParallelTestsFailureTests),
423+
testCase(ParallelTestsTests.__allTests__ParallelTestsTests),
424424
]
425425
}
426426
#endif

0 commit comments

Comments
 (0)