Skip to content

Commit 8b98167

Browse files
swift-ciswift-ci
committed
Merge pull request #325 from ahoppen/tests-update
2 parents 94ea04b + f0dec0e commit 8b98167

15 files changed

+41
-41
lines changed

‎Tests/Build/DescribeTests.swift

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

3434
extension DescribeTests {
35-
static var allTests: [(String, DescribeTests -> () throws -> Void)] {
35+
static var allTests: [(String, (DescribeTests) -> () throws -> Void)] {
3636
return [
3737
("testDescribingNoModulesThrows", testDescribingNoModulesThrows),
3838
]

‎Tests/Build/PackageVersionDataTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ final class PackageVersionDataTests: XCTestCase {
6161
}
6262

6363
extension PackageVersionDataTests {
64-
static var allTests: [(String, PackageVersionDataTests -> () throws -> Void)] {
64+
static var allTests: [(String, (PackageVersionDataTests) -> () throws -> Void)] {
6565
return [
6666
("testPackageVersionData", testPackageVersionData),
6767
("testPackageEmptyVersionData", testPackageEmptyVersionData),

‎Tests/Build/PkgConfigParserTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ final class PkgConfigParserTests: XCTestCase {
6666

6767

6868
extension PkgConfigParserTests {
69-
static var allTests : [(String, PkgConfigParserTests -> () throws -> Void)] {
69+
static var allTests : [(String, (PkgConfigParserTests) -> () throws -> Void)] {
7070
return [
7171
("testGTK3PCFile", testGTK3PCFile),
7272
]

‎Tests/Functional/ClangModuleTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class TestClangModulesTestCase: XCTestCase {
101101

102102

103103
extension TestClangModulesTestCase {
104-
static var allTests : [(String, TestClangModulesTestCase -> () throws -> Void)] {
104+
static var allTests : [(String, (TestClangModulesTestCase) -> () throws -> Void)] {
105105
return [
106106
("testSingleModuleFlatCLibrary", testSingleModuleFlatCLibrary),
107107
("testSingleModuleCLibraryInSources", testSingleModuleCLibraryInSources),

‎Tests/Functional/ModuleMapTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ModuleMapsTestCase: XCTestCase {
6868

6969

7070
extension ModuleMapsTestCase {
71-
static var allTests : [(String, ModuleMapsTestCase -> () throws -> Void)] {
71+
static var allTests : [(String, (ModuleMapsTestCase) -> () throws -> Void)] {
7272
return [
7373
("testDirectDependency", testDirectDependency),
7474
("testTransitiveDependency", testTransitiveDependency),

‎Tests/Functional/ValidLayoutTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ extension ValidLayoutsTestCase {
132132

133133

134134
extension DependencyResolutionTestCase {
135-
static var allTests : [(String, DependencyResolutionTestCase -> () throws -> Void)] {
135+
static var allTests : [(String, (DependencyResolutionTestCase) -> () throws -> Void)] {
136136
return [
137137
("testInternalSimple", testInternalSimple),
138138
("testInternalComplex", testInternalComplex),
@@ -144,7 +144,7 @@ extension DependencyResolutionTestCase {
144144
}
145145

146146
extension InvalidLayoutsTestCase {
147-
static var allTests : [(String, InvalidLayoutsTestCase -> () throws -> Void)] {
147+
static var allTests : [(String, (InvalidLayoutsTestCase) -> () throws -> Void)] {
148148
return [
149149
("testMultipleRoots", testMultipleRoots),
150150
("testInvalidLayout1", testInvalidLayout1),
@@ -157,7 +157,7 @@ extension InvalidLayoutsTestCase {
157157
}
158158

159159
extension MiscellaneousTestCase {
160-
static var allTests : [(String, MiscellaneousTestCase -> () throws -> Void)] {
160+
static var allTests : [(String, (MiscellaneousTestCase) -> () throws -> Void)] {
161161
return [
162162
("testPrintsSelectedDependencyVersion", testPrintsSelectedDependencyVersion),
163163
("testPackageWithNoSources", testPackageWithNoSources),
@@ -189,7 +189,7 @@ extension MiscellaneousTestCase {
189189
}
190190

191191
extension ValidLayoutsTestCase {
192-
static var allTests : [(String, ValidLayoutsTestCase -> () throws -> Void)] {
192+
static var allTests : [(String, (ValidLayoutsTestCase) -> () throws -> Void)] {
193193
return [
194194
("testSingleModuleLibrary", testSingleModuleLibrary),
195195
("testSingleModuleExecutable", testSingleModuleExecutable),

‎Tests/Get/RawCloneTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private func tryCloningRepoWithTag(_ tag: String?, shouldCrash: Bool) {
6767

6868

6969
extension VersionGraphTests {
70-
static var allTests : [(String, VersionGraphTests -> () throws -> Void)] {
70+
static var allTests : [(String, (VersionGraphTests) -> () throws -> Void)] {
7171
return [
7272
("testNoGraph", testNoGraph),
7373
("testOneDependency", testOneDependency),
@@ -87,7 +87,7 @@ extension VersionGraphTests {
8787
}
8888

8989
extension GetTests {
90-
static var allTests : [(String, GetTests -> () throws -> Void)] {
90+
static var allTests : [(String, (GetTests) -> () throws -> Void)] {
9191
return [
9292
("testRawCloneDoesNotCrashIfManifestIsNotPresent", testRawCloneDoesNotCrashIfManifestIsNotPresent),
9393
("testRangeConstrain", testRangeConstrain),
@@ -97,7 +97,7 @@ extension GetTests {
9797
}
9898

9999
extension GitTests {
100-
static var allTests : [(String, GitTests -> () throws -> Void)] {
100+
static var allTests : [(String, (GitTests) -> () throws -> Void)] {
101101
return [
102102
("testHasVersion", testHasVersion),
103103
("testHasNoVersion", testHasNoVersion),

‎Tests/ManifestParser/TOMLTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TOMLTests: XCTestCase {
109109

110110

111111
extension TOMLTests {
112-
static var allTests : [(String, TOMLTests -> () throws -> Void)] {
112+
static var allTests : [(String, (TOMLTests) -> () throws -> Void)] {
113113
return [
114114
("testLexer", testLexer),
115115
("testParser", testParser),
@@ -119,15 +119,15 @@ extension TOMLTests {
119119
}
120120

121121
extension ManifestTests {
122-
static var allTests : [(String, ManifestTests -> () throws -> Void)] {
122+
static var allTests : [(String, (ManifestTests) -> () throws -> Void)] {
123123
return [
124124
("testManifestLoading", testManifestLoading),
125125
]
126126
}
127127
}
128128

129129
extension PackageTests {
130-
static var allTests : [(String, PackageTests -> () throws -> Void)] {
130+
static var allTests : [(String, (PackageTests) -> () throws -> Void)] {
131131
return [
132132
("testBasics", testBasics),
133133
("testExclude", testExclude),

‎Tests/OptionsParser/OptionParserTests.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ enum Mode: String, Argument {
118118
init?(argument: String, pop: () -> String?) throws {
119119
switch argument {
120120
case "--A":
121-
self = A
121+
self = .A
122122
case "--B":
123-
self = B
123+
self = .B
124124
case "--C":
125-
self = C
125+
self = .C
126126
default:
127127
return nil
128128
}
@@ -135,15 +135,15 @@ enum Flag: Argument, Equatable {
135135
init?(argument: String, pop: () -> String?) throws {
136136
switch argument {
137137
case "--D":
138-
self = D
138+
self = .D
139139
case "--E":
140-
self = E
140+
self = .E
141141
case "--F":
142142
guard let str = pop() else { throw Error.ExpectedAssociatedValue("") }
143-
self = F(str)
143+
self = .F(str)
144144
case "--G":
145145
guard let str = pop(), int = Int(str) else { throw Error.ExpectedAssociatedValue("") }
146-
self = G(int)
146+
self = .G(int)
147147
case "-H":
148148
self = .H
149149
case "-I":

‎Tests/PackageDescription/PackageTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PackageTests: XCTestCase {
3030
}
3131

3232
extension PackageTests {
33-
static var allTests : [(String, PackageTests -> () throws -> Void)] {
33+
static var allTests : [(String, (PackageTests) -> () throws -> Void)] {
3434
return [
3535
("testMatchDependencyWithPreReleaseVersion", testMatchDependencyWithPreReleaseVersion),
3636
]

‎Tests/PackageDescription/VersionTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class VersionTests: XCTestCase {
238238

239239

240240
extension VersionTests {
241-
static var allTests : [(String, VersionTests -> () throws -> Void)] {
241+
static var allTests : [(String, (VersionTests) -> () throws -> Void)] {
242242
return [
243243
("testEquality", testEquality),
244244
("testNegativeValuesBecomeZero", testNegativeValuesBecomeZero),

‎Tests/PackageType/PackageNameTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PackageTests: XCTestCase {
3636

3737

3838
extension PackageTests {
39-
static var allTests : [(String, PackageTests -> () throws -> Void)] {
39+
static var allTests : [(String, (PackageTests) -> () throws -> Void)] {
4040
return [
4141
("testUrlEndsInDotGit1", testUrlEndsInDotGit1),
4242
("testUrlEndsInDotGit2", testUrlEndsInDotGit2),

‎Tests/Transmute/XCTestManifests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
extension ModuleDependencyTests {
12-
static var allTests : [(String, ModuleDependencyTests -> () throws -> Void)] {
12+
static var allTests : [(String, (ModuleDependencyTests) -> () throws -> Void)] {
1313
return [
1414
("test1", test1),
1515
("test2", test2),
@@ -22,7 +22,7 @@ extension ModuleDependencyTests {
2222
}
2323

2424
extension PrimitiveResolutionTests {
25-
static var allTests : [(String, PrimitiveResolutionTests -> () throws -> Void)] {
25+
static var allTests : [(String, (PrimitiveResolutionTests) -> () throws -> Void)] {
2626
return [
2727
("testResolvesSingleSwiftModule", testResolvesSingleSwiftModule),
2828
("testResolvesSystemModulePackage", testResolvesSystemModulePackage),
@@ -32,7 +32,7 @@ extension PrimitiveResolutionTests {
3232
}
3333

3434
extension ValidSourcesTests {
35-
static var allTests : [(String, ValidSourcesTests -> () throws -> Void)] {
35+
static var allTests : [(String, (ValidSourcesTests) -> () throws -> Void)] {
3636
return [
3737
("testDotFilesAreIgnored", testDotFilesAreIgnored),
3838
]

‎Tests/Utility/GitTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class GitUtilityTests: XCTestCase {
9393
}
9494

9595
extension GitUtilityTests {
96-
static var allTests : [(String, GitUtilityTests -> () throws -> Void)] {
96+
static var allTests : [(String, (GitUtilityTests) -> () throws -> Void)] {
9797
return [
9898
("testGitVersion", testGitVersion),
9999
("testHeadSha", testHeadSha),

‎Tests/Utility/XCTestManifests.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
extension ByteStringTests {
12-
static var allTests : [(String, ByteStringTests -> () throws -> Void)] {
12+
static var allTests : [(String, (ByteStringTests) -> () throws -> Void)] {
1313
return [
1414
("testInitializers", testInitializers),
1515
("testAccessors", testAccessors),
@@ -22,7 +22,7 @@ extension ByteStringTests {
2222
}
2323

2424
extension CollectionTests {
25-
static var allTests : [(String, CollectionTests -> () throws -> Void)] {
25+
static var allTests : [(String, (CollectionTests) -> () throws -> Void)] {
2626
return [
2727
("testPick", testPick),
2828
("testPartitionByType", testPartitionByType),
@@ -33,7 +33,7 @@ extension CollectionTests {
3333
}
3434

3535
extension FileTests {
36-
static var allTests : [(String, FileTests -> () throws -> Void)] {
36+
static var allTests : [(String, (FileTests) -> () throws -> Void)] {
3737
return [
3838
("testOpenFile", testOpenFile),
3939
("testOpenFileFail", testOpenFileFail),
@@ -45,15 +45,15 @@ extension FileTests {
4545

4646

4747
extension RmtreeTests {
48-
static var allTests : [(String, RmtreeTests -> () throws -> Void)] {
48+
static var allTests : [(String, (RmtreeTests) -> () throws -> Void)] {
4949
return [
5050
("testDoesNotFollowSymlinks", testDoesNotFollowSymlinks),
5151
]
5252
}
5353
}
5454

5555
extension OutputByteStreamTests {
56-
static var allTests : [(String, OutputByteStreamTests -> () throws -> Void)] {
56+
static var allTests : [(String, (OutputByteStreamTests) -> () throws -> Void)] {
5757
return [
5858
("testBasics", testBasics),
5959
("testStreamOperator", testStreamOperator),
@@ -64,7 +64,7 @@ extension OutputByteStreamTests {
6464
}
6565

6666
extension PathTests {
67-
static var allTests : [(String, PathTests -> () throws -> Void)] {
67+
static var allTests : [(String, (PathTests) -> () throws -> Void)] {
6868
return [
6969
("test", test),
7070
("testPrecombined", testPrecombined),
@@ -78,7 +78,7 @@ extension PathTests {
7878
}
7979

8080
extension WalkTests {
81-
static var allTests : [(String, WalkTests -> () throws -> Void)] {
81+
static var allTests : [(String, (WalkTests) -> () throws -> Void)] {
8282
return [
8383
("testNonRecursive", testNonRecursive),
8484
("testRecursive", testRecursive),
@@ -89,7 +89,7 @@ extension WalkTests {
8989
}
9090

9191
extension StatTests {
92-
static var allTests : [(String, StatTests -> () throws -> Void)] {
92+
static var allTests : [(String, (StatTests) -> () throws -> Void)] {
9393
return [
9494
("test_isdir", test_isdir),
9595
("test_isfile", test_isfile),
@@ -100,7 +100,7 @@ extension StatTests {
100100
}
101101

102102
extension RelativePathTests {
103-
static var allTests : [(String, RelativePathTests -> () throws -> Void)] {
103+
static var allTests : [(String, (RelativePathTests) -> () throws -> Void)] {
104104
return [
105105
("testAbsolute", testAbsolute),
106106
("testRelative", testRelative),
@@ -112,7 +112,7 @@ extension RelativePathTests {
112112
}
113113

114114
extension ShellTests {
115-
static var allTests : [(String, ShellTests -> () throws -> Void)] {
115+
static var allTests : [(String, (ShellTests) -> () throws -> Void)] {
116116
return [
117117
("testPopen", testPopen),
118118
("testPopenWithBufferLargerThanThatAllocated", testPopenWithBufferLargerThanThatAllocated),
@@ -123,7 +123,7 @@ extension ShellTests {
123123

124124

125125
extension StringTests {
126-
static var allTests : [(String, StringTests -> () throws -> Void)] {
126+
static var allTests : [(String, (StringTests) -> () throws -> Void)] {
127127
return [
128128
("testTrailingChomp", testTrailingChomp),
129129
("testEmptyChomp", testEmptyChomp),
@@ -136,7 +136,7 @@ extension StringTests {
136136
}
137137

138138
extension URLTests {
139-
static var allTests : [(String, URLTests -> () throws -> Void)] {
139+
static var allTests : [(String, (URLTests) -> () throws -> Void)] {
140140
return [
141141
("testSchema", testSchema),
142142
]

0 commit comments

Comments
 (0)