Prevent Unwanted CompileErrorCaptureGroup Matches (#372)

cpisciotta · Feb 10, 2025 · ac0ed6c · ac0ed6c
1 parent c868dfd
commit ac0ed6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Sources/XcbeautifyLib/CaptureGroups.swift b/Sources/XcbeautifyLib/CaptureGroups.swift
@@ -1584,11 +1584,14 @@ struct NoCertificateCaptureGroup: ErrorCaptureGroup {
 struct CompileErrorCaptureGroup: CaptureGroup {
     static let outputType: OutputType = .error
 
+    // Includes `(?!\-)` to prevent capturing XCTest failure messages.
+    // Example: /Users/.../Tests.swift:13: error: -[Tests.Tests someTest] : XCTAssertEqual failed: ("Optional("...")") is not equal to ("Optional("....")")
+    //
     /// Regular expression captured groups:
     /// $1 = file path
     /// $2 = is fatal error
     /// $3 = reason
-    static let regex = XCRegex(pattern: #"^(([^:]*):*\d*:*\d*):\s(?:fatal\s)?error:\s(.*)$"#)
+    static let regex = XCRegex(pattern: #"^(([^:]*):*\d*:*\d*):\s(?:fatal\s)?error:\s(?!\-)(.*)$"#)
 
     let filePath: String
     let isFatalError: String

diff --git a/Tests/XcbeautifyLibTests/CaptureGroupTests.swift b/Tests/XcbeautifyLibTests/CaptureGroupTests.swift
@@ -153,4 +153,14 @@ final class CaptureGroupTests: XCTestCase {
         XCTAssertEqual(groups[1], "Target")
         XCTAssertEqual(groups[2], "Project")
     }
+
+    func testMatchTestFailure() {
+        let input = #"/Users/andres/Git/xcbeautify/Tests/XcbeautifyLibTests/XcbeautifyLibTests.swift:13: error: -[XcbeautifyLibTests.XcbeautifyLibTests testAggregateTarget] : XCTAssertEqual failed: ("Optional("Aggregate target Be Aggro of project AggregateExample with configuration Debug")") is not equal to ("Optional("failing Aggregate target Be Aggro of project AggregateExample with configuration Debug")")"#
+        XCTAssertNotNil(FailingTestCaptureGroup.regex.captureGroups(for: input))
+    }
+
+    func testNegativeMatchTestFailureAsCompileError() {
+        let input = #"/Users/andres/Git/xcbeautify/Tests/XcbeautifyLibTests/XcbeautifyLibTests.swift:13: error: -[XcbeautifyLibTests.XcbeautifyLibTests testAggregateTarget] : XCTAssertEqual failed: ("Optional("Aggregate target Be Aggro of project AggregateExample with configuration Debug")") is not equal to ("Optional("failing Aggregate target Be Aggro of project AggregateExample with configuration Debug")")"#
+        XCTAssertNil(CompileErrorCaptureGroup.regex.captureGroups(for: input))
+    }
 }