Skip to content
This repository was archived by the owner on Jul 3, 2024. It is now read-only.

Commit 9c00708

Browse files
committed
Require list of cases for diagnoses
1 parent 50f5c4a commit 9c00708

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

Sources/CLI/main.swift

+3-4
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,9 @@ struct Doctor: ParsableCommand {
196196
for: condition,
197197
progress: activity
198198
) {
199-
if let references = diagnosis.cases?.sorted() {
200-
for reference in references {
201-
printdiag(text: reference, kind: .result)
202-
}
199+
precondition(!diagnosis.cases.isEmpty)
200+
for reference in diagnosis.cases.sorted() {
201+
printdiag(text: reference, kind: .result)
203202
}
204203
printdiag(text: diagnosis.conclusion, kind: .important)
205204
if let supplemental = diagnosis.help {

Sources/XCDoctor/Diagnosis.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public struct Diagnosis {
8181
/**
8282
Represents a set of concrete cases that are directly linked to causing this diagnosis.
8383
*/
84-
public let cases: [String]?
84+
public let cases: [String]
8585
}
8686

8787
private func nonExistentFiles(in project: XcodeProject) -> [FileReference] {

Tests/DiagnosisTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DiagnosisTests: XCTestCase {
2020
let diagnosis = examine(project: project, for: .nonExistentFiles)
2121
XCTAssertNotNil(diagnosis)
2222
XCTAssertNotNil(diagnosis!.cases)
23-
XCTAssert(diagnosis!.cases!.count == 1)
23+
XCTAssert(diagnosis!.cases.count == 1)
2424
}
2525

2626
func testMissingFolder() {
@@ -32,7 +32,7 @@ class DiagnosisTests: XCTestCase {
3232
let diagnosis = examine(project: project, for: .nonExistentPaths)
3333
XCTAssertNotNil(diagnosis)
3434
XCTAssertNotNil(diagnosis!.cases)
35-
XCTAssert(diagnosis!.cases!.count == 1)
35+
XCTAssert(diagnosis!.cases.count == 1)
3636
}
3737

3838
func testCorruptPlist() {
@@ -45,7 +45,7 @@ class DiagnosisTests: XCTestCase {
4545
let diagnosis = examine(project: project, for: condition)
4646
XCTAssertNotNil(diagnosis)
4747
XCTAssertNotNil(diagnosis!.cases)
48-
XCTAssert(diagnosis!.cases!.count == 1)
48+
XCTAssert(diagnosis!.cases.count == 1)
4949
}
5050

5151
func testDanglingFile() {
@@ -58,7 +58,7 @@ class DiagnosisTests: XCTestCase {
5858
let diagnosis = examine(project: project, for: condition)
5959
XCTAssertNotNil(diagnosis)
6060
XCTAssertNotNil(diagnosis!.cases)
61-
XCTAssert(diagnosis!.cases!.count == 1)
61+
XCTAssert(diagnosis!.cases.count == 1)
6262
}
6363

6464
func testEmptyGroups() {

Tests/XcodeProjectTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class XcodeProjectTests: XCTestCase {
8484
let diagnosis = examine(project: project, for: .nonExistentFiles)
8585
XCTAssertNotNil(diagnosis)
8686
XCTAssertNotNil(diagnosis!.cases)
87-
XCTAssert(diagnosis!.cases!.count == 1)
87+
XCTAssert(diagnosis!.cases.count == 1)
8888
}
8989

9090
func testMissingFolder() {
@@ -96,7 +96,7 @@ class XcodeProjectTests: XCTestCase {
9696
let diagnosis = examine(project: project, for: .nonExistentPaths)
9797
XCTAssertNotNil(diagnosis)
9898
XCTAssertNotNil(diagnosis!.cases)
99-
XCTAssert(diagnosis!.cases!.count == 1)
99+
XCTAssert(diagnosis!.cases.count == 1)
100100
}
101101

102102
func testCorruptPlist() {
@@ -109,7 +109,7 @@ class XcodeProjectTests: XCTestCase {
109109
let diagnosis = examine(project: project, for: condition)
110110
XCTAssertNotNil(diagnosis)
111111
XCTAssertNotNil(diagnosis!.cases)
112-
XCTAssert(diagnosis!.cases!.count == 1)
112+
XCTAssert(diagnosis!.cases.count == 1)
113113
}
114114

115115
func testDanglingFile() {
@@ -122,7 +122,7 @@ class XcodeProjectTests: XCTestCase {
122122
let diagnosis = examine(project: project, for: condition)
123123
XCTAssertNotNil(diagnosis)
124124
XCTAssertNotNil(diagnosis!.cases)
125-
XCTAssert(diagnosis!.cases!.count == 1)
125+
XCTAssert(diagnosis!.cases.count == 1)
126126
}
127127

128128
func testEmptyGroups() {

0 commit comments

Comments
 (0)