Skip to content

Commit 69de681

Browse files
compnerdcompnerd
authored
Merge pull request #603 from compnerd/unwrapped
SourceKitLSPTests: remove many cases of forced unwrapping
2 parents dc77a6d + 7d8113a commit 69de681

File tree

4 files changed

+82
-82
lines changed

4 files changed

+82
-82
lines changed

‎Tests/SourceKitLSPTests/BuildSystemTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ final class BuildSystemTests: XCTestCase {
393393
}
394394
}
395395

396-
func testMainFilesChanged() {
397-
let ws = try! mutableSourceKitTibsTestWorkspace(name: "MainFiles")!
396+
func testMainFilesChanged() throws {
397+
let ws = try mutableSourceKitTibsTestWorkspace(name: "MainFiles")!
398398
let unique_h = ws.testLoc("unique").docIdentifier.uri
399399

400400
ws.testServer.client.allowUnexpectedNotification = false
@@ -406,7 +406,7 @@ final class BuildSystemTests: XCTestCase {
406406
expectation.fulfill()
407407
}
408408

409-
try! ws.openDocument(unique_h.fileURL!, language: .cpp)
409+
try ws.openDocument(unique_h.fileURL!, language: .cpp)
410410
wait(for: [expectation], timeout: defaultTimeout)
411411

412412
let use_d = self.expectation(description: "update settings to d.cpp")
@@ -419,7 +419,7 @@ final class BuildSystemTests: XCTestCase {
419419
use_d.fulfill()
420420
}
421421

422-
try! ws.buildAndIndex()
422+
try ws.buildAndIndex()
423423
wait(for: [use_d], timeout: defaultTimeout)
424424

425425
let use_c = self.expectation(description: "update settings to c.cpp")
@@ -432,7 +432,7 @@ final class BuildSystemTests: XCTestCase {
432432
use_c.fulfill()
433433
}
434434

435-
try! ws.edit(rebuild: true) { (changes, _) in
435+
try ws.edit(rebuild: true) { (changes, _) in
436436
changes.write("""
437437
// empty
438438
""", to: ws.testLoc("d_func").url)

‎Tests/SourceKitLSPTests/LocalSwiftTests.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ final class LocalSwiftTests: XCTestCase {
601601
XCTAssertEqual("Remove 'foo ='", CodeAction.fixitTitle(replace: "foo =", with: ""))
602602
}
603603

604-
func testFixitsAreReturnedFromCodeActions() {
604+
func testFixitsAreReturnedFromCodeActions() throws {
605605
let url = URL(fileURLWithPath: "/\(#function)/a.swift")
606606
let uri = DocumentURI(url)
607607

@@ -626,7 +626,7 @@ final class LocalSwiftTests: XCTestCase {
626626
context: CodeActionContext(diagnostics: [diagnostic], only: nil),
627627
textDocument: TextDocumentIdentifier(uri)
628628
)
629-
let response = try! sk.sendSync(request)
629+
let response = try sk.sendSync(request)
630630

631631
XCTAssertNotNil(response)
632632
guard case .codeActions(let codeActions) = response else {
@@ -651,7 +651,7 @@ final class LocalSwiftTests: XCTestCase {
651651
command: nil))
652652
}
653653

654-
func testFixitsAreReturnedFromCodeActionsNotes() {
654+
func testFixitsAreReturnedFromCodeActionsNotes() throws {
655655
let url = URL(fileURLWithPath: "/\(#function)/a.swift")
656656
let uri = DocumentURI(url)
657657

@@ -676,7 +676,7 @@ final class LocalSwiftTests: XCTestCase {
676676
context: CodeActionContext(diagnostics: [diagnostic], only: nil),
677677
textDocument: TextDocumentIdentifier(uri)
678678
)
679-
let response = try! sk.sendSync(request)
679+
let response = try sk.sendSync(request)
680680

681681
XCTAssertNotNil(response)
682682
guard case .codeActions(let codeActions) = response else {
@@ -706,7 +706,7 @@ final class LocalSwiftTests: XCTestCase {
706706
}
707707
}
708708

709-
func testMuliEditFixitCodeActionPrimary() {
709+
func testMuliEditFixitCodeActionPrimary() throws {
710710
let url = URL(fileURLWithPath: "/\(#function)/a.swift")
711711
let uri = DocumentURI(url)
712712

@@ -730,7 +730,7 @@ final class LocalSwiftTests: XCTestCase {
730730
context: CodeActionContext(diagnostics: [diagnostic], only: nil),
731731
textDocument: TextDocumentIdentifier(uri)
732732
)
733-
let response = try! sk.sendSync(request)
733+
let response = try sk.sendSync(request)
734734

735735
XCTAssertNotNil(response)
736736
guard case .codeActions(let codeActions) = response else {
@@ -749,7 +749,7 @@ final class LocalSwiftTests: XCTestCase {
749749
])
750750
}
751751

752-
func testMuliEditFixitCodeActionNote() {
752+
func testMuliEditFixitCodeActionNote() throws {
753753
let url = URL(fileURLWithPath: "/\(#function)/a.swift")
754754
let uri = DocumentURI(url)
755755

@@ -776,7 +776,7 @@ final class LocalSwiftTests: XCTestCase {
776776
context: CodeActionContext(diagnostics: [diagnostic], only: nil),
777777
textDocument: TextDocumentIdentifier(uri)
778778
)
779-
let response = try! sk.sendSync(request)
779+
let response = try sk.sendSync(request)
780780

781781
XCTAssertNotNil(response)
782782
guard case .codeActions(let codeActions) = response else {
@@ -1273,7 +1273,7 @@ final class LocalSwiftTests: XCTestCase {
12731273
}
12741274
}
12751275

1276-
func testDocumentSymbolHighlight() {
1276+
func testDocumentSymbolHighlight() throws {
12771277
let url = URL(fileURLWithPath: "/\(#function)/a.swift")
12781278
let uri = DocumentURI(url)
12791279

@@ -1292,14 +1292,14 @@ final class LocalSwiftTests: XCTestCase {
12921292
""")))
12931293

12941294
do {
1295-
let resp = try! sk.sendSync(DocumentHighlightRequest(
1295+
let resp = try sk.sendSync(DocumentHighlightRequest(
12961296
textDocument: TextDocumentIdentifier(url),
12971297
position: Position(line: 0, utf16index: 0)))
12981298
XCTAssertEqual(resp?.count, 0)
12991299
}
13001300

13011301
do {
1302-
let resp = try! sk.sendSync(DocumentHighlightRequest(
1302+
let resp = try sk.sendSync(DocumentHighlightRequest(
13031303
textDocument: TextDocumentIdentifier(url),
13041304
position: Position(line: 1, utf16index: 6)))
13051305
XCTAssertEqual(resp?.count, 1)
@@ -1312,7 +1312,7 @@ final class LocalSwiftTests: XCTestCase {
13121312
}
13131313

13141314
do {
1315-
let resp = try! sk.sendSync(DocumentHighlightRequest(
1315+
let resp = try sk.sendSync(DocumentHighlightRequest(
13161316
textDocument: TextDocumentIdentifier(url),
13171317
position: Position(line: 2, utf16index: 6)))
13181318
XCTAssertEqual(resp?.count, 2)
@@ -1331,7 +1331,7 @@ final class LocalSwiftTests: XCTestCase {
13311331
}
13321332

13331333
do {
1334-
let resp = try! sk.sendSync(DocumentHighlightRequest(
1334+
let resp = try sk.sendSync(DocumentHighlightRequest(
13351335
textDocument: TextDocumentIdentifier(url),
13361336
position: Position(line: 3, utf16index: 6)))
13371337
XCTAssertEqual(resp?.count, 3)

‎Tests/SourceKitLSPTests/MainFilesProviderTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import XCTest
2020

2121
final class MainFilesProviderTests: XCTestCase {
2222

23-
func testMainFilesChanged() {
23+
func testMainFilesChanged() throws {
2424
let ws = try! mutableSourceKitTibsTestWorkspace(name: "MainFiles")!
2525
let indexDelegate = SourceKitIndexDelegate()
2626
ws.tibsWorkspace.delegate = indexDelegate
@@ -52,7 +52,7 @@ final class MainFilesProviderTests: XCTestCase {
5252
XCTAssertEqual(ws.index.mainFilesContainingFile(shared_h), [])
5353
XCTAssertEqual(ws.index.mainFilesContainingFile(bridging), [])
5454

55-
try! ws.buildAndIndex()
55+
try ws.buildAndIndex()
5656

5757
XCTAssertEqual(ws.index.mainFilesContainingFile(a), [a])
5858
XCTAssertEqual(ws.index.mainFilesContainingFile(b), [b])
@@ -64,7 +64,7 @@ final class MainFilesProviderTests: XCTestCase {
6464

6565
wait(for: [mainFilesDelegate.expectation], timeout: defaultTimeout)
6666

67-
try! ws.edit { changes, _ in
67+
try ws.edit { changes, _ in
6868
changes.write("""
6969
#include "bridging.h"
7070
void d_new(void) { bridging(); }
@@ -77,7 +77,7 @@ final class MainFilesProviderTests: XCTestCase {
7777
}
7878

7979
mainFilesDelegate.expectation = expectation(description: "main files changed after edit")
80-
try! ws.buildAndIndex()
80+
try ws.buildAndIndex()
8181

8282
XCTAssertEqual(ws.index.mainFilesContainingFile(unique_h), [c])
8383
XCTAssertEqual(ws.index.mainFilesContainingFile(shared_h), [])

0 commit comments

Comments
 (0)