Fix the PluginInvocationTests.testCompilationDiagnostics() test so th…

…at it doesn't throw if there are no diagnostics at all reported (#6080) This is a supplemental fix for #6076 to avoid the XCTUnwrap() that causes the test to still fail.
swiftlang · Jan 27, 2023 · e05a2b8 · e05a2b8
1 parent 7981b85
commit e05a2b8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
@@ -418,11 +418,11 @@ class PluginInvocationTests: XCTestCase {
                     let diaFileContents = try localFileSystem.readFileContents(result.diagnosticsFile)
                     let diagnosticsSet = try SerializedDiagnostics(bytes: diaFileContents)
                     let hasExpectedDiagnosticsCount = diagnosticsSet.diagnostics.count == 1
-                    let warningDiagnostic = try XCTUnwrap(diagnosticsSet.diagnostics.first)
-                    let hasExpectedWarningText = warningDiagnostic.text.hasPrefix("variable \'unused\' was never used")
+                    let warningDiagnosticText = diagnosticsSet.diagnostics.first?.text ?? ""
+                    let hasExpectedWarningText = warningDiagnosticText.hasPrefix("variable \'unused\' was never used")
                     if hasExpectedDiagnosticsCount && hasExpectedWarningText {
                         XCTAssertTrue(hasExpectedDiagnosticsCount, "unexpected diagnostics count in \(diagnosticsSet.diagnostics) from \(result.diagnosticsFile.pathString)")
-                        XCTAssertTrue(hasExpectedWarningText, "\(warningDiagnostic)")
+                        XCTAssertTrue(hasExpectedWarningText, "\(warningDiagnosticText)")
                     } else {
                         print("bytes of serialized diagnostics file `\(result.diagnosticsFile.pathString)`: \(diaFileContents.contents)")
                         try XCTSkipIf(true, "skipping because of unknown serialized diagnostics issue")