Skip to content

Commit 7cb16db

Browse files
cpisciottacpisciotta
committed
Delete TestSummary
1 parent e3898d2 commit 7cb16db

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
@@ -94,6 +90,10 @@ package class Parser {
9490
PackageGraphResolvingEndedCaptureGroup.self,
9591
PackageGraphResolvedItemCaptureGroup.self,
9692
DuplicateLocalizedStringKeyCaptureGroup.self,
93+
ExecutedWithoutSkippedCaptureGroup.self,
94+
ExecutedWithSkippedCaptureGroup.self,
95+
TestSuiteAllTestsPassedCaptureGroup.self,
96+
TestSuiteAllTestsFailedCaptureGroup.self,
9797
]
9898

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

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

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

‎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
@@ -168,45 +168,18 @@ final class GitHubActionsRendererTests: XCTestCase {
168168
let input4 = "Executed 1 test, with 1 failure (1 unexpected) in 0.200 (0.200) seconds"
169169

170170
// First test plan
171-
XCTAssertNil(parser.summary)
172-
XCTAssertFalse(parser.needToRecordSummary)
173171
let formatted1 = logFormatted(input1)
174-
#if os(macOS)
175-
// FIXME: Failing on Linux
176-
XCTAssertTrue(parser.needToRecordSummary)
177-
#endif
178172
let formatted2 = logFormatted(input2)
179-
XCTAssertFalse(parser.needToRecordSummary)
180173
XCTAssertNil(formatted1)
181174
XCTAssertNil(formatted2)
182175

183176
#if os(macOS)
184177
// FIXME: Failing on Linux
185-
var summary = try XCTUnwrap(parser.summary)
186-
187-
XCTAssertEqual(summary.testsCount, 3)
188-
XCTAssertEqual(summary.failuresCount, 2)
189-
XCTAssertEqual(summary.unexpectedCount, 1)
190-
XCTAssertEqual(summary.skippedCount, 0)
191-
XCTAssertEqual(summary.time, 0.112)
192-
193-
// Second test plan
194-
XCTAssertNotNil(parser.summary)
195-
XCTAssertFalse(parser.needToRecordSummary)
196178
let formatted3 = logFormatted(input3)
197-
XCTAssertTrue(parser.needToRecordSummary)
198179
let formatted4 = logFormatted(input4)
199-
XCTAssertFalse(parser.needToRecordSummary)
200180
XCTAssertNil(formatted3)
201181
XCTAssertNil(formatted4)
202182

203-
summary = try XCTUnwrap(parser.summary)
204-
205-
XCTAssertEqual(summary.testsCount, 4)
206-
XCTAssertEqual(summary.failuresCount, 3)
207-
XCTAssertEqual(summary.unexpectedCount, 2)
208-
XCTAssertEqual(summary.skippedCount, 0)
209-
XCTAssertEqual(summary.time, 0.312)
210183
#endif
211184
}
212185

@@ -218,38 +191,16 @@ final class GitHubActionsRendererTests: XCTestCase {
218191
let input4 = "Executed 1 test, with 1 test skipped and 1 failure (1 unexpected) in 3.000 (3.000) seconds"
219192

220193
// First test plan
221-
XCTAssertNil(parser.summary)
222-
XCTAssertFalse(parser.needToRecordSummary)
223194
let formatted1 = logFormatted(input1)
224-
XCTAssertTrue(parser.needToRecordSummary)
225195
let formatted2 = logFormatted(input2)
226-
XCTAssertFalse(parser.needToRecordSummary)
227196
XCTAssertNil(formatted1)
228197
XCTAssertNil(formatted2)
229-
XCTAssertNotNil(parser.summary)
230-
231-
XCTAssertEqual(parser.summary?.testsCount, 56)
232-
XCTAssertEqual(parser.summary?.failuresCount, 2)
233-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
234-
XCTAssertEqual(parser.summary?.skippedCount, 3)
235-
XCTAssertEqual(parser.summary?.time, 1.029)
236198

237199
// Second test plan
238-
XCTAssertNotNil(parser.summary)
239-
XCTAssertFalse(parser.needToRecordSummary)
240200
let formatted3 = logFormatted(input3)
241-
XCTAssertTrue(parser.needToRecordSummary)
242201
let formatted4 = logFormatted(input4)
243-
XCTAssertFalse(parser.needToRecordSummary)
244202
XCTAssertNil(formatted3)
245203
XCTAssertNil(formatted4)
246-
XCTAssertNotNil(parser.summary)
247-
248-
XCTAssertEqual(parser.summary?.testsCount, 57)
249-
XCTAssertEqual(parser.summary?.failuresCount, 3)
250-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
251-
XCTAssertEqual(parser.summary?.skippedCount, 4)
252-
XCTAssertEqual(parser.summary?.time, 4.029)
253204
}
254205

255206
func testFailingTest() { }
@@ -502,21 +453,14 @@ final class GitHubActionsRendererTests: XCTestCase {
502453

503454
func testTestSuiteAllTestsPassed() {
504455
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
505-
506-
XCTAssertFalse(parser.needToRecordSummary)
507456
let formatted = logFormatted(input)
508457
XCTAssertNil(formatted)
509-
XCTAssertTrue(parser.needToRecordSummary)
510-
XCTAssertEqual(parser.outputType, .undefined)
511458
}
512459

513460
func testTestSuiteAllTestsFailed() {
514461
let input = "Test Suite 'All tests' failed at 2022-01-15 21:31:49.073."
515-
516-
XCTAssertFalse(parser.needToRecordSummary)
517462
let formatted = logFormatted(input)
518463
XCTAssertNil(formatted)
519-
XCTAssertTrue(parser.needToRecordSummary)
520464
}
521465

522466
func testTestsRunCompletion() { }

‎Tests/XcbeautifyLibTests/RendererTests/TerminalRendererTests.swift

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

150150
// First test plan
151-
XCTAssertNil(parser.summary)
152-
XCTAssertFalse(parser.needToRecordSummary)
153151
let formatted1 = noColoredFormatted(input1)
154-
#if os(macOS)
155-
// FIXME: Failing on Linux
156-
XCTAssertTrue(parser.needToRecordSummary)
157-
#endif
158152
let formatted2 = noColoredFormatted(input2)
159-
XCTAssertFalse(parser.needToRecordSummary)
160153
XCTAssertNil(formatted1)
161154
XCTAssertNil(formatted2)
162155

163156
#if os(macOS)
164-
// FIXME: Failing on Linux
165-
var summary = try XCTUnwrap(parser.summary)
166-
167-
XCTAssertEqual(summary.testsCount, 3)
168-
XCTAssertEqual(summary.failuresCount, 2)
169-
XCTAssertEqual(summary.unexpectedCount, 1)
170-
XCTAssertEqual(summary.skippedCount, 0)
171-
XCTAssertEqual(summary.time, 0.112)
172-
173-
// Second test plan
174-
XCTAssertNotNil(parser.summary)
175-
XCTAssertFalse(parser.needToRecordSummary)
176157
let formatted3 = noColoredFormatted(input3)
177-
XCTAssertTrue(parser.needToRecordSummary)
178158
let formatted4 = noColoredFormatted(input4)
179-
XCTAssertFalse(parser.needToRecordSummary)
180159
XCTAssertNil(formatted3)
181160
XCTAssertNil(formatted4)
182-
183-
summary = try XCTUnwrap(parser.summary)
184-
185-
XCTAssertEqual(summary.testsCount, 4)
186-
XCTAssertEqual(summary.failuresCount, 3)
187-
XCTAssertEqual(summary.unexpectedCount, 2)
188-
XCTAssertEqual(summary.skippedCount, 0)
189-
XCTAssertEqual(summary.time, 0.312)
190161
#endif
191162
}
192163

@@ -198,38 +169,15 @@ final class TerminalRendererTests: XCTestCase {
198169
let input4 = "Executed 1 test, with 1 test skipped and 1 failure (1 unexpected) in 3.000 (3.000) seconds"
199170

200171
// First test plan
201-
XCTAssertNil(parser.summary)
202-
XCTAssertFalse(parser.needToRecordSummary)
203172
let formatted1 = noColoredFormatted(input1)
204-
XCTAssertTrue(parser.needToRecordSummary)
205173
let formatted2 = noColoredFormatted(input2)
206-
XCTAssertFalse(parser.needToRecordSummary)
207174
XCTAssertNil(formatted1)
208175
XCTAssertNil(formatted2)
209-
XCTAssertNotNil(parser.summary)
210-
211-
XCTAssertEqual(parser.summary?.testsCount, 56)
212-
XCTAssertEqual(parser.summary?.failuresCount, 2)
213-
XCTAssertEqual(parser.summary?.unexpectedCount, 1)
214-
XCTAssertEqual(parser.summary?.skippedCount, 3)
215-
XCTAssertEqual(parser.summary?.time, 1.029)
216176

217-
// Second test plan
218-
XCTAssertNotNil(parser.summary)
219-
XCTAssertFalse(parser.needToRecordSummary)
220177
let formatted3 = noColoredFormatted(input3)
221-
XCTAssertTrue(parser.needToRecordSummary)
222178
let formatted4 = noColoredFormatted(input4)
223-
XCTAssertFalse(parser.needToRecordSummary)
224179
XCTAssertNil(formatted3)
225180
XCTAssertNil(formatted4)
226-
XCTAssertNotNil(parser.summary)
227-
228-
XCTAssertEqual(parser.summary?.testsCount, 57)
229-
XCTAssertEqual(parser.summary?.failuresCount, 3)
230-
XCTAssertEqual(parser.summary?.unexpectedCount, 2)
231-
XCTAssertEqual(parser.summary?.skippedCount, 4)
232-
XCTAssertEqual(parser.summary?.time, 4.029)
233181
}
234182

235183
func testFailingTest() { }
@@ -480,19 +428,15 @@ final class TerminalRendererTests: XCTestCase {
480428
func testTestSuiteAllTestsPassed() {
481429
let input = "Test Suite 'All tests' passed at 2022-01-15 21:31:49.073."
482430

483-
XCTAssertFalse(parser.needToRecordSummary)
484431
let formatted = noColoredFormatted(input)
485432
XCTAssertNil(formatted)
486-
XCTAssertTrue(parser.needToRecordSummary)
487433
}
488434

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

492-
XCTAssertFalse(parser.needToRecordSummary)
493438
let formatted = noColoredFormatted(input)
494439
XCTAssertNil(formatted)
495-
XCTAssertTrue(parser.needToRecordSummary)
496440
}
497441

498442
func testTestsRunCompletion() { }

0 commit comments

Comments
 (0)