Skip to content

Commit cd91c1e

Browse files
cpisciottacpisciotta
committed
Delete TestSummary
1 parent d927949 commit cd91c1e

File tree

8 files changed

+4
-222
lines changed

8 files changed

+4
-222
lines changed

‎Sources/XcbeautifyLib/Parser.swift

+4-49
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ package class Parser {
55

66
private let additionalLines: () -> String?
77

8-
private(set) var summary: TestSummary?
9-
10-
private(set) var needToRecordSummary = false
11-
128
private let preserveUnbeautifiedLines: Bool
139

1410
package private(set) var outputType = OutputType.undefined
@@ -100,6 +96,10 @@ package class Parser {
10096
PackageGraphResolvedItemCaptureGroup.self,
10197
DuplicateLocalizedStringKeyCaptureGroup.self,
10298
SwiftDriverJobDiscoveryEmittingModuleCaptureGroup.self,
99+
ExecutedWithoutSkippedCaptureGroup.self,
100+
ExecutedWithSkippedCaptureGroup.self,
101+
TestSuiteAllTestsPassedCaptureGroup.self,
102+
TestSuiteAllTestsFailedCaptureGroup.self,
103103
]
104104

105105
// MARK: - Init
@@ -133,28 +133,6 @@ package class Parser {
133133
guard let idx = captureGroupTypes.firstIndex(where: { $0.regex.match(string: line) }) else {
134134
// Some uncommon cases, which have additional logic and don't follow default flow
135135

136-
if ExecutedWithoutSkippedCaptureGroup.regex.match(string: line) {
137-
outputType = ExecutedWithoutSkippedCaptureGroup.outputType
138-
parseSummary(line: line, colored: colored, skipped: false)
139-
return nil
140-
}
141-
142-
if ExecutedWithSkippedCaptureGroup.regex.match(string: line) {
143-
outputType = ExecutedWithSkippedCaptureGroup.outputType
144-
parseSummary(line: line, colored: colored, skipped: true)
145-
return nil
146-
}
147-
148-
if TestSuiteAllTestsPassedCaptureGroup.regex.match(string: line) {
149-
needToRecordSummary = true
150-
return nil
151-
}
152-
153-
if TestSuiteAllTestsFailedCaptureGroup.regex.match(string: line) {
154-
needToRecordSummary = true
155-
return nil
156-
}
157-
158136
// Nothing found?
159137
outputType = OutputType.undefined
160138
return preserveUnbeautifiedLines ? line : nil
@@ -177,27 +155,4 @@ package class Parser {
177155

178156
return formattedOutput
179157
}
180-
181-
package func formattedSummary() -> String? {
182-
guard let summary else { return nil }
183-
return renderer.format(testSummary: summary)
184-
}
185-
186-
// MARK: Private
187-
188-
private func parseSummary(line: String, colored: Bool, skipped: Bool) {
189-
guard needToRecordSummary else { return }
190-
defer { needToRecordSummary = false }
191-
192-
guard let _group: CaptureGroup = line.captureGroup(with: skipped ? ExecutedWithSkippedCaptureGroup.pattern : ExecutedWithoutSkippedCaptureGroup.pattern) else { return }
193-
guard let group = _group as? ExecutedCaptureGroup else { return }
194-
195-
summary += TestSummary(
196-
testsCount: group.numberOfTests,
197-
skippedCount: group.numberOfSkipped,
198-
failuresCount: group.numberOfFailures,
199-
unexpectedCount: group.numberOfUnexpectedFailures,
200-
time: group.wallClockTimeInSeconds
201-
)
202-
}
203158
}

‎Sources/XcbeautifyLib/Renderers/GitHubActionsRenderer.swift

-10
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,6 @@ struct GitHubActionsRenderer: OutputRendering {
244244
message: warningMessage
245245
)
246246
}
247-
248-
func format(testSummary: TestSummary) -> String {
249-
if testSummary.isSuccess() {
250-
let message = "Tests Passed: \(testSummary.description)"
251-
return outputGitHubActionsLog(annotationType: .notice, message: message)
252-
} else {
253-
let message = "Tests Failed: \(testSummary.description)"
254-
return outputGitHubActionsLog(annotationType: .error, message: message)
255-
}
256-
}
257247
}
258248

259249
private struct FileComponents {

‎Sources/XcbeautifyLib/Renderers/OutputRendering.swift

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ protocol OutputRendering {
66

77
func beautify(line: String, pattern: String) -> String?
88

9-
func format(testSummary: TestSummary) -> String
10-
119
func formatAnalyze(group: AnalyzeCaptureGroup) -> String
1210
func formatCheckDependencies() -> String
1311
func formatCleanRemove(group: CleanRemoveCaptureGroup) -> String

‎Sources/XcbeautifyLib/Renderers/TerminalRenderer.swift

-12
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ struct TerminalRenderer: OutputRendering {
170170
return colored ? Symbol.warning + " " + warningMessage.f.Yellow : Symbol.asciiWarning + " " + warningMessage
171171
}
172172

173-
func formatSummary(line: String) -> String {
174-
colored ? line.f.Green.s.Bold : line
175-
}
176-
177173
func formatPackageFetching(group: PackageFetchingCaptureGroup) -> String {
178174
let source = group.source
179175
return "Fetching " + source
@@ -213,12 +209,4 @@ struct TerminalRenderer: OutputRendering {
213209
func formatParallelTestingFailed(group: ParallelTestingFailedCaptureGroup) -> String {
214210
colored ? group.wholeError.s.Bold.f.Red : group.wholeError
215211
}
216-
217-
func format(testSummary: TestSummary) -> String {
218-
if testSummary.isSuccess() {
219-
colored ? "Tests Passed: \(testSummary.description)".s.Bold.f.Green : "Tests Passed: \(testSummary.description)"
220-
} else {
221-
colored ? "Tests Failed: \(testSummary.description)".s.Bold.f.Red : "Tests Failed: \(testSummary.description)"
222-
}
223-
}
224212
}

‎Sources/XcbeautifyLib/TestSummary.swift

-33
This file was deleted.

‎Sources/xcbeautify/Xcbeautify.swift

-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ struct Xcbeautify: ParsableCommand {
7171
output.write(parser.outputType, formatted)
7272
}
7373

74-
if let formattedSummary = parser.formattedSummary() {
75-
output.write(.result, formattedSummary)
76-
}
77-
7874
if !report.isEmpty {
7975
let outputPath = URL(
8076
fileURLWithPath: reportPath,

‎Tests/XcbeautifyLibTests/RendererTests/GitHubActionsRendererTests.swift

-56
Original file line numberDiff line numberDiff line change
@@ -185,45 +185,18 @@ final class GitHubActionsRendererTests: XCTestCase {
185185
let input4 = "Executed 1 test, with 1 failure (1 unexpected) in 0.200 (0.200) seconds"
186186

187187
// First test plan
188-
XCTAssertNil(parser.summary)
189-
XCTAssertFalse(parser.needToRecordSummary)
190188
let formatted1 = logFormatted(input1)
191-
#if os(macOS)
192-
// FIXME: Failing on Linux
193-
XCTAssertTrue(parser.needToRecordSummary)
194-
#endif
195189
let formatted2 = logFormatted(input2)
196-
XCTAssertFalse(parser.needToRecordSummary)
197190
XCTAssertNil(formatted1)
198191
XCTAssertNil(formatted2)
199192

200193
#if os(macOS)
201194
// FIXME: Failing on Linux
202-
var summary = try XCTUnwrap(parser.summary)
203-
204-
XCTAssertEqual(summary.testsCount, 3)
205-
XCTAssertEqual(summary.failuresCount, 2)
206-
XCTAssertEqual(summary.unexpectedCount, 1)
207-
XCTAssertEqual(summary.skippedCount, 0)
208-
XCTAssertEqual(summary.time, 0.112)
209-
210-
// Second test plan
211-
XCTAssertNotNil(parser.summary)
212-
XCTAssertFalse(parser.needToRecordSummary)
213195
let formatted3 = logFormatted(input3)
214-
XCTAssertTrue(parser.needToRecordSummary)
215196
let formatted4 = logFormatted(input4)
216-
XCTAssertFalse(parser.needToRecordSummary)
217197
XCTAssertNil(formatted3)
218198
XCTAssertNil(formatted4)
219199

220-
summary = try XCTUnwrap(parser.summary)
221-
222-
XCTAssertEqual(summary.testsCount, 4)
223-
XCTAssertEqual(summary.failuresCount, 3)
224-
XCTAssertEqual(summary.unexpectedCount, 2)
225-
XCTAssertEqual(summary.skippedCount, 0)
226-
XCTAssertEqual(summary.time, 0.312)
227200
#endif
228201
}
229202

@@ -236,38 +209,16 @@ final class GitHubActionsRendererTests: XCTestCase {
236209
let input4 = "Executed 1 test, with 1 test skipped and 1 failure (1 unexpected) in 3.000 (3.000) seconds"
237210

238211
// First test plan
239-
XCTAssertNil(parser.summary)
240-
XCTAssertFalse(parser.needToRecordSummary)
241212
let formatted1 = logFormatted(input1)
242-
XCTAssertTrue(parser.needToRecordSummary)
243213
let formatted2 = logFormatted(input2)
244-
XCTAssertFalse(parser.needToRecordSummary)
245214
XCTAssertNil(formatted1)
246215
XCTAssertNil(formatted2)
247-
XCTAssertNotNil(parser.summary)
248-
249-
XCTAssertEqual(parser.summary?.testsCount, 56)
250-
XCTAssertEqual(parser.summary?.failuresCount, 2)
251-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
252-
XCTAssertEqual(parser.summary?.skippedCount, 3)
253-
XCTAssertEqual(parser.summary?.time, 1.029)
254216

255217
// Second test plan
256-
XCTAssertNotNil(parser.summary)
257-
XCTAssertFalse(parser.needToRecordSummary)
258218
let formatted3 = logFormatted(input3)
259-
XCTAssertTrue(parser.needToRecordSummary)
260219
let formatted4 = logFormatted(input4)
261-
XCTAssertFalse(parser.needToRecordSummary)
262220
XCTAssertNil(formatted3)
263221
XCTAssertNil(formatted4)
264-
XCTAssertNotNil(parser.summary)
265-
266-
XCTAssertEqual(parser.summary?.testsCount, 57)
267-
XCTAssertEqual(parser.summary?.failuresCount, 3)
268-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
269-
XCTAssertEqual(parser.summary?.skippedCount, 4)
270-
XCTAssertEqual(parser.summary?.time, 4.029)
271222
}
272223
#endif
273224

@@ -534,23 +485,16 @@ final class GitHubActionsRendererTests: XCTestCase {
534485
#if os(macOS)
535486
func testTestSuiteAllTestsPassed() {
536487
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
537-
538-
XCTAssertFalse(parser.needToRecordSummary)
539488
let formatted = logFormatted(input)
540489
XCTAssertNil(formatted)
541-
XCTAssertTrue(parser.needToRecordSummary)
542-
XCTAssertEqual(parser.outputType, .undefined)
543490
}
544491
#endif
545492

546493
#if os(macOS)
547494
func testTestSuiteAllTestsFailed() {
548495
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
549-
550-
XCTAssertFalse(parser.needToRecordSummary)
551496
let formatted = logFormatted(input)
552497
XCTAssertNil(formatted)
553-
XCTAssertTrue(parser.needToRecordSummary)
554498
}
555499
#endif
556500

‎Tests/XcbeautifyLibTests/RendererTests/TerminalRendererTests.swift

-56
Original file line numberDiff line numberDiff line change
@@ -165,45 +165,16 @@ final class TerminalRendererTests: XCTestCase {
165165
let input4 = "Executed 1 test, with 1 failure (1 unexpected) in 0.200 (0.200) seconds"
166166

167167
// First test plan
168-
XCTAssertNil(parser.summary)
169-
XCTAssertFalse(parser.needToRecordSummary)
170168
let formatted1 = noColoredFormatted(input1)
171-
#if os(macOS)
172-
// FIXME: Failing on Linux
173-
XCTAssertTrue(parser.needToRecordSummary)
174-
#endif
175169
let formatted2 = noColoredFormatted(input2)
176-
XCTAssertFalse(parser.needToRecordSummary)
177170
XCTAssertNil(formatted1)
178171
XCTAssertNil(formatted2)
179172

180173
#if os(macOS)
181-
// FIXME: Failing on Linux
182-
var summary = try XCTUnwrap(parser.summary)
183-
184-
XCTAssertEqual(summary.testsCount, 3)
185-
XCTAssertEqual(summary.failuresCount, 2)
186-
XCTAssertEqual(summary.unexpectedCount, 1)
187-
XCTAssertEqual(summary.skippedCount, 0)
188-
XCTAssertEqual(summary.time, 0.112)
189-
190-
// Second test plan
191-
XCTAssertNotNil(parser.summary)
192-
XCTAssertFalse(parser.needToRecordSummary)
193174
let formatted3 = noColoredFormatted(input3)
194-
XCTAssertTrue(parser.needToRecordSummary)
195175
let formatted4 = noColoredFormatted(input4)
196-
XCTAssertFalse(parser.needToRecordSummary)
197176
XCTAssertNil(formatted3)
198177
XCTAssertNil(formatted4)
199-
200-
summary = try XCTUnwrap(parser.summary)
201-
202-
XCTAssertEqual(summary.testsCount, 4)
203-
XCTAssertEqual(summary.failuresCount, 3)
204-
XCTAssertEqual(summary.unexpectedCount, 2)
205-
XCTAssertEqual(summary.skippedCount, 0)
206-
XCTAssertEqual(summary.time, 0.312)
207178
#endif
208179
}
209180

@@ -216,38 +187,15 @@ final class TerminalRendererTests: XCTestCase {
216187
let input4 = "Executed 1 test, with 1 test skipped and 1 failure (1 unexpected) in 3.000 (3.000) seconds"
217188

218189
// First test plan
219-
XCTAssertNil(parser.summary)
220-
XCTAssertFalse(parser.needToRecordSummary)
221190
let formatted1 = noColoredFormatted(input1)
222-
XCTAssertTrue(parser.needToRecordSummary)
223191
let formatted2 = noColoredFormatted(input2)
224-
XCTAssertFalse(parser.needToRecordSummary)
225192
XCTAssertNil(formatted1)
226193
XCTAssertNil(formatted2)
227-
XCTAssertNotNil(parser.summary)
228-
229-
XCTAssertEqual(parser.summary?.testsCount, 56)
230-
XCTAssertEqual(parser.summary?.failuresCount, 2)
231-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
232-
XCTAssertEqual(parser.summary?.skippedCount, 3)
233-
XCTAssertEqual(parser.summary?.time, 1.029)
234194

235-
// Second test plan
236-
XCTAssertNotNil(parser.summary)
237-
XCTAssertFalse(parser.needToRecordSummary)
238195
let formatted3 = noColoredFormatted(input3)
239-
XCTAssertTrue(parser.needToRecordSummary)
240196
let formatted4 = noColoredFormatted(input4)
241-
XCTAssertFalse(parser.needToRecordSummary)
242197
XCTAssertNil(formatted3)
243198
XCTAssertNil(formatted4)
244-
XCTAssertNotNil(parser.summary)
245-
246-
XCTAssertEqual(parser.summary?.testsCount, 57)
247-
XCTAssertEqual(parser.summary?.failuresCount, 3)
248-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
249-
XCTAssertEqual(parser.summary?.skippedCount, 4)
250-
XCTAssertEqual(parser.summary?.time, 4.029)
251199
}
252200
#endif
253201

@@ -516,21 +464,17 @@ final class TerminalRendererTests: XCTestCase {
516464
func testTestSuiteAllTestsPassed() {
517465
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
518466

519-
XCTAssertFalse(parser.needToRecordSummary)
520467
let formatted = noColoredFormatted(input)
521468
XCTAssertNil(formatted)
522-
XCTAssertTrue(parser.needToRecordSummary)
523469
}
524470
#endif
525471

526472
#if os(macOS)
527473
func testTestSuiteAllTestsFailed() {
528474
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
529475

530-
XCTAssertFalse(parser.needToRecordSummary)
531476
let formatted = noColoredFormatted(input)
532477
XCTAssertNil(formatted)
533-
XCTAssertTrue(parser.needToRecordSummary)
534478
}
535479
#endif
536480

0 commit comments

Comments
 (0)