refactor: apply fix only to json mode

Author: felangel

pkgs/test/test/runner/coverage_test.dart

@@ -167,9 +167,7 @@ dev_dependencies:
         workingDirectory: pkgDir,
       );
       await validateTest(test);
-      expect(
-        File(lcovFile).readAsStringSync(),
-        contains('''
+      expect(File(lcovFile).readAsStringSync(), '''
 SF:${p.join(pkgDir, 'lib', 'calculate.dart')}
 DA:1,1
 DA:2,2
@@ -178,8 +176,7 @@ DA:5,0
 LF:4
 LH:3
 end_of_record
-'''),
-      );
+''');
     });
 
     test('gathers coverage for tests in multiple packages', () async {
@@ -274,9 +271,7 @@ dev_dependencies:
         workingDirectory: pkgDir,
       );
       await validateTest(test);
-      expect(
-        File(lcovFile).readAsStringSync(),
-        contains('''
+      expect(File(lcovFile).readAsStringSync(), '''
 SF:${p.join(pkgDir, 'lib', 'calculate.dart')}
 DA:1,1
 DA:2,2
@@ -285,11 +280,10 @@ DA:5,0
 LF:4
 LH:3
 end_of_record
-'''),
-      );
+''');
     });
 
-    test('gathers coverage for code outside of lib (dart_frog)', () async {
+    test('gathers coverage for code outside of lib in json mode', () async {
       await d.dir(d.sandbox, [
         d.dir('dart_frog_sample', [
           d.file('pubspec.yaml', '''
@@ -343,14 +337,28 @@ void main() {
       ]).create();
 
       final pkgDir = p.join(d.sandbox, 'dart_frog_sample');
+      await (await runPub([
+        'global',
+        'activate',
+        'coverage',
+      ], workingDirectory: pkgDir)).shouldExit(0);
       await (await runPub(['get'], workingDirectory: pkgDir)).shouldExit(0);
       final lcovFile = p.join(coverageDirectory.path, 'lcov.info');
       var test = await runTest(
-        ['--coverage-path', lcovFile, 'test/routes/index_test.dart'],
+        ['--coverage', coverageDirectory.path, 'test/routes/index_test.dart'],
         packageConfig: p.join(pkgDir, '.dart_tool/package_config.json'),
         workingDirectory: pkgDir,
       );
       await validateTest(test);
+      await (await runPub([
+        'global',
+        'run',
+        'coverage:format_coverage',
+        '--lcov',
+        '--in=${coverageDirectory.path}',
+        '--out=$lcovFile',
+        '--report-on=lib,routes',
+      ], workingDirectory: pkgDir)).shouldExit(0);
       expect(
         File(lcovFile).readAsStringSync(),
         contains('''

pkgs/test_core/lib/src/runner/vm/platform.dart

@@ -427,7 +427,7 @@ Future<Map<String, dynamic>> _gatherCoverage(
     false,
     false,
     false,
-    await _filterCoveragePackages(config.coveragePackages),
+    await _filterCoveragePackages(config.coveragePackages, config.coverageLcov),
     isolateIds: {isolateId!},
     branchCoverage: config.branchCoverage,
   );
@@ -456,17 +456,25 @@ void _setupPauseAfterTests() {
 
 Future<Set<String>> _filterCoveragePackages(
   List<RegExp>? coveragePackages,
+  String? coverageLcov,
 ) async {
   if (coveragePackages == null || coveragePackages.isEmpty) {
-    // If no filters were provided, report coverage for all packages.
-    // This is required to maintain backward compatibility particularly
-    // in cases where coverage is required for files outside of the lib directory.
-    // See https://github.com/dart-lang/test/issues/2581
-    return {};
-  } else {
-    return (await currentPackageConfig).packages
-        .map((package) => package.name)
-        .where((name) => coveragePackages.any((re) => re.hasMatch(name)))
-        .toSet();
+    if (coverageLcov == null) {
+      // If no filters were provided, report coverage for all packages.
+      // This is required to maintain backward compatibility particularly
+      // in cases where coverage is required for files outside of the lib directory.
+      // See https://github.com/dart-lang/test/issues/2581
+      return {};
+    }
+    return workspacePackageNames(await currentPackage);
+  }
+
+  if (coveragePackages.isEmpty) {
+    return workspacePackageNames(await currentPackage);
   }
+
+  return (await currentPackageConfig).packages
+      .map((package) => package.name)
+      .where((name) => coveragePackages.any((re) => re.hasMatch(name)))
+      .toSet();
 }