Skip to content

Commit 307c9e7

Browse files
cpisciottacpisciotta
committed
Delete TestSummary
1 parent ba64919 commit 307c9e7

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
@@ -98,6 +94,10 @@ package class Parser {
9894
PackageGraphResolvedItemCaptureGroup.self,
9995
DuplicateLocalizedStringKeyCaptureGroup.self,
10096
SwiftDriverJobDiscoveryEmittingModuleCaptureGroup.self,
97+
ExecutedWithoutSkippedCaptureGroup.self,
98+
ExecutedWithSkippedCaptureGroup.self,
99+
TestSuiteAllTestsPassedCaptureGroup.self,
100+
TestSuiteAllTestsFailedCaptureGroup.self,
101101
]
102102

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

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

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

‎Sources/XcbeautifyLib/Renderers/GitHubActionsRenderer.swift

-10
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,6 @@ struct GitHubActionsRenderer: OutputRendering {
218218
message: warningMessage
219219
)
220220
}
221-
222-
func format(testSummary: TestSummary) -> String {
223-
if testSummary.isSuccess() {
224-
let message = "Tests Passed: \(testSummary.description)"
225-
return outputGitHubActionsLog(annotationType: .notice, message: message)
226-
} else {
227-
let message = "Tests Failed: \(testSummary.description)"
228-
return outputGitHubActionsLog(annotationType: .error, message: message)
229-
}
230-
}
231221
}
232222

233223
private struct FileComponents {

‎Sources/XcbeautifyLib/Renderers/OutputRendering.swift

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

66
func beautify(line: String, pattern: String, additionalLines: @escaping () -> (String?)) -> String?
77

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

‎Sources/XcbeautifyLib/Renderers/TerminalRenderer.swift

-12
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ struct TerminalRenderer: OutputRendering {
151151
return colored ? Symbol.warning + " " + warningMessage.f.Yellow : Symbol.asciiWarning + " " + warningMessage
152152
}
153153

154-
func formatSummary(line: String) -> String {
155-
colored ? line.f.Green.s.Bold : line
156-
}
157-
158154
func formatPackageFetching(group: PackageFetchingCaptureGroup) -> String {
159155
let source = group.source
160156
return "Fetching " + source
@@ -194,12 +190,4 @@ struct TerminalRenderer: OutputRendering {
194190
func formatParallelTestingFailed(group: ParallelTestingFailedCaptureGroup) -> String {
195191
colored ? group.wholeError.s.Bold.f.Red : group.wholeError
196192
}
197-
198-
func format(testSummary: TestSummary) -> String {
199-
if testSummary.isSuccess() {
200-
colored ? "Tests Passed: \(testSummary.description)".s.Bold.f.Green : "Tests Passed: \(testSummary.description)"
201-
} else {
202-
colored ? "Tests Failed: \(testSummary.description)".s.Bold.f.Red : "Tests Failed: \(testSummary.description)"
203-
}
204-
}
205193
}

‎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

@@ -522,23 +473,16 @@ final class GitHubActionsRendererTests: XCTestCase {
522473
#if os(macOS)
523474
func testTestSuiteAllTestsPassed() {
524475
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
525-
526-
XCTAssertFalse(parser.needToRecordSummary)
527476
let formatted = logFormatted(input)
528477
XCTAssertNil(formatted)
529-
XCTAssertTrue(parser.needToRecordSummary)
530-
XCTAssertEqual(parser.outputType, .undefined)
531478
}
532479
#endif
533480

534481
#if os(macOS)
535482
func testTestSuiteAllTestsFailed() {
536483
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
537-
538-
XCTAssertFalse(parser.needToRecordSummary)
539484
let formatted = logFormatted(input)
540485
XCTAssertNil(formatted)
541-
XCTAssertTrue(parser.needToRecordSummary)
542486
}
543487
#endif
544488

‎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

@@ -504,21 +452,17 @@ final class TerminalRendererTests: XCTestCase {
504452
func testTestSuiteAllTestsPassed() {
505453
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
506454

507-
XCTAssertFalse(parser.needToRecordSummary)
508455
let formatted = noColoredFormatted(input)
509456
XCTAssertNil(formatted)
510-
XCTAssertTrue(parser.needToRecordSummary)
511457
}
512458
#endif
513459

514460
#if os(macOS)
515461
func testTestSuiteAllTestsFailed() {
516462
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
517463

518-
XCTAssertFalse(parser.needToRecordSummary)
519464
let formatted = noColoredFormatted(input)
520465
XCTAssertNil(formatted)
521-
XCTAssertTrue(parser.needToRecordSummary)
522466
}
523467
#endif
524468

0 commit comments

Comments
 (0)