Skip to content

Commit 5e1180a

Browse files
cpisciottacpisciotta
committed
Delete TestSummary
1 parent eae9f85 commit 5e1180a

File tree

8 files changed

+4
-218
lines changed

8 files changed

+4
-218
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
@@ -96,6 +92,10 @@ package class Parser {
9692
PackageGraphResolvingEndedCaptureGroup.self,
9793
PackageGraphResolvedItemCaptureGroup.self,
9894
DuplicateLocalizedStringKeyCaptureGroup.self,
95+
ExecutedWithoutSkippedCaptureGroup.self,
96+
ExecutedWithSkippedCaptureGroup.self,
97+
TestSuiteAllTestsPassedCaptureGroup.self,
98+
TestSuiteAllTestsFailedCaptureGroup.self,
9999
]
100100

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

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

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

‎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

-8
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,4 @@ struct TerminalRenderer: OutputRendering {
194194
func formatParallelTestingFailed(group: ParallelTestingFailedCaptureGroup) -> String {
195195
colored ? group.wholeError.s.Bold.f.Red : group.wholeError
196196
}
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-
}
205197
}

‎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

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

237210
// First test plan
238-
XCTAssertNil(parser.summary)
239-
XCTAssertFalse(parser.needToRecordSummary)
240211
let formatted1 = logFormatted(input1)
241-
XCTAssertTrue(parser.needToRecordSummary)
242212
let formatted2 = logFormatted(input2)
243-
XCTAssertFalse(parser.needToRecordSummary)
244213
XCTAssertNil(formatted1)
245214
XCTAssertNil(formatted2)
246-
XCTAssertNotNil(parser.summary)
247-
248-
XCTAssertEqual(parser.summary?.testsCount, 56)
249-
XCTAssertEqual(parser.summary?.failuresCount, 2)
250-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
251-
XCTAssertEqual(parser.summary?.skippedCount, 3)
252-
XCTAssertEqual(parser.summary?.time, 1.029)
253215

254216
// Second test plan
255-
XCTAssertNotNil(parser.summary)
256-
XCTAssertFalse(parser.needToRecordSummary)
257217
let formatted3 = logFormatted(input3)
258-
XCTAssertTrue(parser.needToRecordSummary)
259218
let formatted4 = logFormatted(input4)
260-
XCTAssertFalse(parser.needToRecordSummary)
261219
XCTAssertNil(formatted3)
262220
XCTAssertNil(formatted4)
263-
XCTAssertNotNil(parser.summary)
264-
265-
XCTAssertEqual(parser.summary?.testsCount, 57)
266-
XCTAssertEqual(parser.summary?.failuresCount, 3)
267-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
268-
XCTAssertEqual(parser.summary?.skippedCount, 4)
269-
XCTAssertEqual(parser.summary?.time, 4.029)
270221
}
271222

272223
func testFailingTest() { }
@@ -519,21 +470,14 @@ final class GitHubActionsRendererTests: XCTestCase {
519470

520471
func testTestSuiteAllTestsPassed() {
521472
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
522-
523-
XCTAssertFalse(parser.needToRecordSummary)
524473
let formatted = logFormatted(input)
525474
XCTAssertNil(formatted)
526-
XCTAssertTrue(parser.needToRecordSummary)
527-
XCTAssertEqual(parser.outputType, .undefined)
528475
}
529476

530477
func testTestSuiteAllTestsFailed() {
531478
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
532-
533-
XCTAssertFalse(parser.needToRecordSummary)
534479
let formatted = logFormatted(input)
535480
XCTAssertNil(formatted)
536-
XCTAssertTrue(parser.needToRecordSummary)
537481
}
538482

539483
func testTestsRunCompletion() { }

‎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

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

217188
// First test plan
218-
XCTAssertNil(parser.summary)
219-
XCTAssertFalse(parser.needToRecordSummary)
220189
let formatted1 = noColoredFormatted(input1)
221-
XCTAssertTrue(parser.needToRecordSummary)
222190
let formatted2 = noColoredFormatted(input2)
223-
XCTAssertFalse(parser.needToRecordSummary)
224191
XCTAssertNil(formatted1)
225192
XCTAssertNil(formatted2)
226-
XCTAssertNotNil(parser.summary)
227-
228-
XCTAssertEqual(parser.summary?.testsCount, 56)
229-
XCTAssertEqual(parser.summary?.failuresCount, 2)
230-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
231-
XCTAssertEqual(parser.summary?.skippedCount, 3)
232-
XCTAssertEqual(parser.summary?.time, 1.029)
233193

234-
// Second test plan
235-
XCTAssertNotNil(parser.summary)
236-
XCTAssertFalse(parser.needToRecordSummary)
237194
let formatted3 = noColoredFormatted(input3)
238-
XCTAssertTrue(parser.needToRecordSummary)
239195
let formatted4 = noColoredFormatted(input4)
240-
XCTAssertFalse(parser.needToRecordSummary)
241196
XCTAssertNil(formatted3)
242197
XCTAssertNil(formatted4)
243-
XCTAssertNotNil(parser.summary)
244-
245-
XCTAssertEqual(parser.summary?.testsCount, 57)
246-
XCTAssertEqual(parser.summary?.failuresCount, 3)
247-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
248-
XCTAssertEqual(parser.summary?.skippedCount, 4)
249-
XCTAssertEqual(parser.summary?.time, 4.029)
250198
}
251199

252200
func testFailingTest() { }
@@ -497,19 +445,15 @@ final class TerminalRendererTests: XCTestCase {
497445
func testTestSuiteAllTestsPassed() {
498446
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
499447

500-
XCTAssertFalse(parser.needToRecordSummary)
501448
let formatted = noColoredFormatted(input)
502449
XCTAssertNil(formatted)
503-
XCTAssertTrue(parser.needToRecordSummary)
504450
}
505451

506452
func testTestSuiteAllTestsFailed() {
507453
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
508454

509-
XCTAssertFalse(parser.needToRecordSummary)
510455
let formatted = noColoredFormatted(input)
511456
XCTAssertNil(formatted)
512-
XCTAssertTrue(parser.needToRecordSummary)
513457
}
514458

515459
func testTestsRunCompletion() { }

0 commit comments

Comments
 (0)