Skip to content

Commit a67eb08

Browse files
cameroncookecameroncooke
committed
Add support for earlier Swift versions
1 parent 3110804 commit a67eb08

9 files changed

+18
-18
lines changed

‎Sources/ParameterizedTesting/ParameterizedTestsCase1.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ open class ParameterizedTestCase1<IN1, OUT>: ParameterizedTestCase {
5656

5757
// MARK: - Private -
5858

59-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
59+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
6060
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
6161
let params1 = values()
6262

@@ -81,7 +81,7 @@ open class ParameterizedTestCase1<IN1, OUT>: ParameterizedTestCase {
8181

8282
test.setValue(value1, forKey: ParameterizedTestCaseKey.value1)
8383

84-
if let expectedValues {
84+
if let expectedValues = expectedValues {
8585
if expectedValues.count == totalCombinations {
8686
let expectedValue = expectedValues[counter]
8787
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase2.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ open class ParameterizedTestCase2<IN1, IN2, OUT>: ParameterizedTestCase {
6262

6363
// MARK: - Private -
6464

65-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
65+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
6666
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
6767
let (params1, params2) = values()
6868

@@ -89,7 +89,7 @@ open class ParameterizedTestCase2<IN1, IN2, OUT>: ParameterizedTestCase {
8989
test.setValue(value1, forKey: ParameterizedTestCaseKey.value1)
9090
test.setValue(value2, forKey: ParameterizedTestCaseKey.value2)
9191

92-
if let expectedValues {
92+
if let expectedValues = expectedValues {
9393
if expectedValues.count == totalCombinations {
9494
let expectedValue = expectedValues[counter]
9595
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase3.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ open class ParameterizedTestCase3<IN1, IN2, IN3, OUT>: ParameterizedTestCase {
6868

6969
// MARK: - Private -
7070

71-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
71+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
7272
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
7373
let (params1, params2, params3) = values()
7474

@@ -97,7 +97,7 @@ open class ParameterizedTestCase3<IN1, IN2, IN3, OUT>: ParameterizedTestCase {
9797
test.setValue(value2, forKey: ParameterizedTestCaseKey.value2)
9898
test.setValue(value3, forKey: ParameterizedTestCaseKey.value3)
9999

100-
if let expectedValues {
100+
if let expectedValues = expectedValues {
101101
if expectedValues.count == totalCombinations {
102102
let expectedValue = expectedValues[counter]
103103
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase4.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ open class ParameterizedTestCase4<IN1, IN2, IN3, IN4, OUT>: ParameterizedTestCas
8181

8282
// MARK: - Private -
8383

84-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
84+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
8585
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
8686
let (params1, params2, params3, params4) = values()
8787

@@ -112,7 +112,7 @@ open class ParameterizedTestCase4<IN1, IN2, IN3, IN4, OUT>: ParameterizedTestCas
112112
test.setValue(value3, forKey: ParameterizedTestCaseKey.value3)
113113
test.setValue(value4, forKey: ParameterizedTestCaseKey.value4)
114114

115-
if let expectedValues {
115+
if let expectedValues = expectedValues {
116116
if expectedValues.count == totalCombinations {
117117
let expectedValue = expectedValues[counter]
118118
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase5.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ open class ParameterizedTestCase5<IN1, IN2, IN3, IN4, IN5, OUT>: ParameterizedTe
8888

8989
// MARK: - Private -
9090

91-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
91+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
9292
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
9393
let (params1, params2, params3, params4, params5) = values()
9494

@@ -121,7 +121,7 @@ open class ParameterizedTestCase5<IN1, IN2, IN3, IN4, IN5, OUT>: ParameterizedTe
121121
test.setValue(value4, forKey: ParameterizedTestCaseKey.value4)
122122
test.setValue(value5, forKey: ParameterizedTestCaseKey.value5)
123123

124-
if let expectedValues {
124+
if let expectedValues = expectedValues {
125125
if expectedValues.count == totalCombinations {
126126
let expectedValue = expectedValues[counter]
127127
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase6.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ open class ParameterizedTestCase6<IN1, IN2, IN3, IN4, IN5, IN6, OUT>: Parameteri
9595

9696
// MARK: - Private -
9797

98-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
98+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
9999
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
100100
let (params1, params2, params3, params4, params5, params6) = values()
101101

@@ -131,7 +131,7 @@ open class ParameterizedTestCase6<IN1, IN2, IN3, IN4, IN5, IN6, OUT>: Parameteri
131131
test.setValue(value5, forKey: ParameterizedTestCaseKey.value5)
132132
test.setValue(value6, forKey: ParameterizedTestCaseKey.value6)
133133

134-
if let expectedValues {
134+
if let expectedValues = expectedValues {
135135
if expectedValues.count == totalCombinations {
136136
let expectedValue = expectedValues[counter]
137137
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase7.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ open class ParameterizedTestCase7<IN1, IN2, IN3, IN4, IN5, IN6, IN7, OUT>: Param
102102

103103
// MARK: - Private -
104104

105-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
105+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
106106
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
107107
let (params1, params2, params3, params4, params5, params6, params7) = values()
108108

@@ -140,7 +140,7 @@ open class ParameterizedTestCase7<IN1, IN2, IN3, IN4, IN5, IN6, IN7, OUT>: Param
140140
test.setValue(value6, forKey: ParameterizedTestCaseKey.value6)
141141
test.setValue(value7, forKey: ParameterizedTestCaseKey.value7)
142142

143-
if let expectedValues {
143+
if let expectedValues = expectedValues {
144144
if expectedValues.count == totalCombinations {
145145
let expectedValue = expectedValues[counter]
146146
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase8.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ open class ParameterizedTestCase8<IN1, IN2, IN3, IN4, IN5, IN6, IN7, IN8, OUT>:
110110

111111
// MARK: - Private -
112112

113-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
113+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
114114
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
115115
let (params1, params2, params3, params4, params5, params6, params7, params8) = values()
116116

@@ -150,7 +150,7 @@ open class ParameterizedTestCase8<IN1, IN2, IN3, IN4, IN5, IN6, IN7, IN8, OUT>:
150150
test.setValue(value7, forKey: ParameterizedTestCaseKey.value7)
151151
test.setValue(value8, forKey: ParameterizedTestCaseKey.value8)
152152

153-
if let expectedValues {
153+
if let expectedValues = expectedValues {
154154
if expectedValues.count == totalCombinations {
155155
let expectedValue = expectedValues[counter]
156156
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

‎Sources/ParameterizedTesting/ParameterizedTestsCase9.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ open class ParameterizedTestCase9<IN1, IN2, IN3, IN4, IN5, IN6, IN7, IN8, IN9, O
117117

118118
// MARK: - Private -
119119

120-
private static func customTestSuite(_ subclassType: (some XCTestCase).Type) -> XCTestSuite {
120+
private static func customTestSuite<T: XCTestCase>(_ subclassType: T.Type) -> XCTestSuite {
121121
let suite = XCTestSuite(forTestCaseWithName: UUID().uuidString)
122122
let (params1, params2, params3, params4, params5, params6, params7, params8, params9) = values()
123123

@@ -160,7 +160,7 @@ open class ParameterizedTestCase9<IN1, IN2, IN3, IN4, IN5, IN6, IN7, IN8, IN9, O
160160
test.setValue(value8, forKey: ParameterizedTestCaseKey.value8)
161161
test.setValue(value9, forKey: ParameterizedTestCaseKey.value9)
162162

163-
if let expectedValues {
163+
if let expectedValues = expectedValues {
164164
if expectedValues.count == totalCombinations {
165165
let expectedValue = expectedValues[counter]
166166
test.setValue(expectedValue, forKey: ParameterizedTestCaseKey.expectedValue)

0 commit comments

Comments
 (0)