@@ -175,9 +175,9 @@ func testReportGenerator(t *testing.T, target *targets.Target, test Test) {
175175 if test .Result != "" {
176176 t .Fatalf ("got no error, but expected %q" , test .Result )
177177 }
178- checkCSVReport (t , reps .csv )
179- checkJSONLReport (t , reps .jsonl , sampleCoverJSON )
180- checkJSONLReport (t , reps .jsonlPrograms , sampleJSONLlProgs )
178+ checkCSVReport (t , reps .csv . Bytes () )
179+ checkJSONLReport (t , reps .jsonl . Bytes () , sampleCoverJSON )
180+ checkJSONLReport (t , reps .jsonlPrograms . Bytes () , sampleJSONLlProgs )
181181}
182182
183183const kcovCode = `
@@ -292,9 +292,9 @@ func buildTestBinary(t *testing.T, target *targets.Target, test *Test, dir strin
292292}
293293
294294type reports struct {
295- csv [] byte
296- jsonl [] byte
297- jsonlPrograms [] byte
295+ csv * bytes. Buffer
296+ jsonl * bytes. Buffer
297+ jsonlPrograms * bytes. Buffer
298298}
299299
300300func generateReport (t * testing.T , target * targets.Target , test * Test ) (* reports , error ) {
@@ -387,29 +387,17 @@ func generateReport(t *testing.T, target *targets.Target, test *Test) (*reports,
387387 if err := rg .DoHTML (new (bytes.Buffer ), params ); err != nil {
388388 return nil , err
389389 }
390- if err := rg .DoSubsystemCover (new (bytes.Buffer ), params ); err != nil {
391- return nil , err
392- }
393- csv := new (bytes.Buffer )
394- if err := rg .DoFuncCover (csv , params ); err != nil {
395- return nil , err
396- }
397- if err := rg .DoFileCover (new (bytes.Buffer ), params ); err != nil {
398- return nil , err
399- }
400- jsonl := new (bytes.Buffer )
401- if err := rg .DoCoverJSONL (jsonl , params ); err != nil {
402- return nil , err
403- }
404- jsonlProgs := new (bytes.Buffer )
405- if err := rg .DoCoverPrograms (jsonlProgs , params ); err != nil {
406- return nil , err
407- }
408- return & reports {
409- csv : csv .Bytes (),
410- jsonl : jsonl .Bytes (),
411- jsonlPrograms : jsonlProgs .Bytes (),
412- }, nil
390+ assert .NoError (t , rg .DoSubsystemCover (new (bytes.Buffer ), params ))
391+ assert .NoError (t , rg .DoFileCover (new (bytes.Buffer ), params ))
392+ res := & reports {
393+ csv : new (bytes.Buffer ),
394+ jsonl : new (bytes.Buffer ),
395+ jsonlPrograms : new (bytes.Buffer ),
396+ }
397+ assert .NoError (t , rg .DoFuncCover (res .csv , params ))
398+ assert .NoError (t , rg .DoCoverJSONL (res .jsonl , params ))
399+ assert .NoError (t , rg .DoCoverPrograms (res .jsonlPrograms , params ))
400+ return res , nil
413401}
414402
415403func checkCSVReport (t * testing.T , CSVReport []byte ) {
0 commit comments