Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/test_core/lib/src/runner/coverage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import '../util/package_config.dart';
import 'live_suite_controller.dart';

/// Collects coverage and outputs to the [coveragePath] path.
Future<Map<String, HitMap>> writeCoverage(
Future<Coverage> writeCoverage(
String? coveragePath,
LiveSuiteController controller,
) async {
Expand All @@ -35,7 +35,7 @@ Future<Map<String, HitMap>> writeCoverage(

Future<void> writeCoverageLcov(
String coverageLcov,
Map<String, HitMap> allCoverageData,
Coverage allCoverageData,
) async {
final resolver = await Resolver.create(
packagePath: (await currentPackage).root.toFilePath(),
Expand All @@ -51,3 +51,9 @@ Future<void> writeCoverageLcov(
await out.flush();
await out.close();
}

typedef Coverage = Map<String, HitMap>;

extension Merge on Coverage {
void merge(Coverage other) => FileHitMaps(this).merge(other);
}
18 changes: 11 additions & 7 deletions pkgs/test_core/lib/src/runner/coverage_stub.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:coverage/coverage.dart';

import 'live_suite_controller.dart';

Future<Map<String, HitMap>> writeCoverage(
Future<Coverage> writeCoverage(
String? coveragePath,
LiveSuiteController controller,
) =>
throw UnsupportedError(
'Coverage is only supported through the test runner.',
);

Future<void> writeCoverageLcov(
String coverageLcov,
Map<String, HitMap> allCoverageData,
) =>
Future<void> writeCoverageLcov(String coverageLcov, Coverage allCoverageData) =>
throw UnsupportedError(
'Coverage is only supported through the test runner.',
);

typedef Coverage = Map<String, void>;

extension Merge on Coverage {
void merge(Coverage other) =>
throw UnsupportedError(
'Coverage is only supported through the test runner.',
);
}
3 changes: 1 addition & 2 deletions pkgs/test_core/lib/src/runner/engine.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import 'dart:math';

import 'package:async/async.dart' hide Result;
import 'package:collection/collection.dart';
import 'package:coverage/coverage.dart';
import 'package:pool/pool.dart';
import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports
import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports
Expand Down Expand Up @@ -68,7 +67,7 @@ class Engine {
final String? _coverageLcov;

/// The merged coverage data from all tests.
final Map<String, HitMap> _allCoverageData = {};
final Coverage _allCoverageData = {};

/// The seed used to generate randomness for test case shuffling.
///
Expand Down
Loading