diff --git a/Sources/XcbeautifyLib/CaptureGroups.swift b/Sources/XcbeautifyLib/CaptureGroups.swift index 1f392864..c0b59441 100644 --- a/Sources/XcbeautifyLib/CaptureGroups.swift +++ b/Sources/XcbeautifyLib/CaptureGroups.swift @@ -1317,29 +1317,6 @@ struct TestsRunCompletionCaptureGroup: CaptureGroup { struct TestSuiteStartedCaptureGroup: CaptureGroup { static let outputType: OutputType = .test - /// Regular expression captured groups: - /// $1 = suite - /// $2 = time - #if os(Linux) - static let regex = XCRegex(pattern: #"^\s*Test Suite '(.*)' started at(.*)"#) - #else - static let regex = XCRegex(pattern: #"^\s*Test Suite '(?:.*\/)?(.*[ox]ctest.*)' started at(.*)"#) - #endif - - let suite: String - let time: String - - init?(groups: [String]) { - assert(groups.count >= 2) - guard let suite = groups[safe: 0], let time = groups[safe: 1] else { return nil } - self.suite = suite - self.time = time - } -} - -struct TestSuiteStartCaptureGroup: CaptureGroup { - static let outputType: OutputType = .test - /// Regular expression captured groups: /// $1 = test suite name static let regex = XCRegex(pattern: #"^\s*Test Suite '(.*)' started at"#) diff --git a/Sources/XcbeautifyLib/Formatter.swift b/Sources/XcbeautifyLib/Formatter.swift index f2302e8f..b4684c8e 100644 --- a/Sources/XcbeautifyLib/Formatter.swift +++ b/Sources/XcbeautifyLib/Formatter.swift @@ -204,8 +204,6 @@ package struct Formatter { return renderer.formatTestSuiteAllTestsFailed(group: group) case let group as TestSuiteAllTestsPassedCaptureGroup: return renderer.formatTestSuiteAllTestsPassed(group: group) - case let group as TestSuiteStartCaptureGroup: - return renderer.formatTestSuiteStart(group: group) case let group as TestSuiteStartedCaptureGroup: return renderer.formatTestSuiteStarted(group: group) case let group as TIFFutilCaptureGroup: diff --git a/Sources/XcbeautifyLib/JunitReporter.swift b/Sources/XcbeautifyLib/JunitReporter.swift index 314111ee..c177f298 100644 --- a/Sources/XcbeautifyLib/JunitReporter.swift +++ b/Sources/XcbeautifyLib/JunitReporter.swift @@ -35,7 +35,7 @@ package final class JunitReporter { } else if let groups = TestCaseSkippedCaptureGroup.regex.captureGroups(for: line) { guard let testCase = generateSkippedTest(groups: groups) else { return } components.append(.skippedTest(testCase)) - } else if let groups = TestSuiteStartCaptureGroup.regex.captureGroups(for: line) { + } else if let groups = TestSuiteStartedCaptureGroup.regex.captureGroups(for: line) { guard let testStart = generateSuiteStart(groups: groups) else { return } components.append(.testSuiteStart(testStart)) } else if let groups = ParallelTestCaseFailedCaptureGroup.regex.captureGroups(for: line) { @@ -91,7 +91,7 @@ package final class JunitReporter { } private func generateSuiteStart(groups: [String]) -> String? { - guard let group = TestSuiteStartCaptureGroup(groups: groups) else { return nil } + guard let group = TestSuiteStartedCaptureGroup(groups: groups) else { return nil } return group.testSuiteName } diff --git a/Sources/XcbeautifyLib/Parser.swift b/Sources/XcbeautifyLib/Parser.swift index aa94dc17..1e84296d 100644 --- a/Sources/XcbeautifyLib/Parser.swift +++ b/Sources/XcbeautifyLib/Parser.swift @@ -52,7 +52,6 @@ package final class Parser { ProcessInfoPlistCaptureGroup.self, TestsRunCompletionCaptureGroup.self, TestSuiteStartedCaptureGroup.self, - TestSuiteStartCaptureGroup.self, TIFFutilCaptureGroup.self, TouchCaptureGroup.self, WriteFileCaptureGroup.self, diff --git a/Sources/XcbeautifyLib/Renderers/OutputRendering.swift b/Sources/XcbeautifyLib/Renderers/OutputRendering.swift index ae5237c2..549f64ee 100644 --- a/Sources/XcbeautifyLib/Renderers/OutputRendering.swift +++ b/Sources/XcbeautifyLib/Renderers/OutputRendering.swift @@ -80,7 +80,6 @@ protocol OutputRendering { func formatTestsRunCompletion(group: TestsRunCompletionCaptureGroup) -> String func formatTestSuiteAllTestsFailed(group: TestSuiteAllTestsFailedCaptureGroup) -> String func formatTestSuiteAllTestsPassed(group: TestSuiteAllTestsPassedCaptureGroup) -> String - func formatTestSuiteStart(group: TestSuiteStartCaptureGroup) -> String func formatTestSuiteStarted(group: TestSuiteStartedCaptureGroup) -> String func formatTIFFUtil(group: TIFFutilCaptureGroup) -> String? func formatTouch(group: TouchCaptureGroup) -> String @@ -387,13 +386,8 @@ extension OutputRendering { group.wholeResult } - func formatTestSuiteStart(group: TestSuiteStartCaptureGroup) -> String { - let testSuite = group.testSuiteName - return colored ? testSuite.s.Bold : testSuite - } - func formatTestSuiteStarted(group: TestSuiteStartedCaptureGroup) -> String { - let testSuite = group.suite + let testSuite = group.testSuiteName let heading = "Test Suite \(testSuite) started" return colored ? heading.s.Bold.f.Cyan : heading }