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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:hooks/dart_identifier_generator.dart';
import 'package:test/test.dart';

void main() {
group('$DartIdentifierGenerator', () {
group(DartIdentifierGenerator, () {
test('can be instantiated', () {
expect(DartIdentifierGenerator.new, returnsNormally);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void main() {

final result = await commandRunner.run(['test']);

expect(result, equals(ExitCode.unavailable.code));
expect(result, equals(ExitCode.software.code));
verify(
() => logger.err(any(that: contains('- test/.test_optimizer.dart'))),
).called(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void main() {

await expectLater(
commandRunner.run(['test', '--coverage']),
completion(equals(ExitCode.unavailable.code)),
completion(equals(ExitCode.software.code)),
);
verify(
() => logger.err(any(that: contains('Expected coverage >= 100.00%'))),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/cli/templates/test_optimizer_bundle.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions lib/src/cli/test_cli_runner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,11 @@ class TestCLIRunner {
? body.call()
: overrideAnsiOutput(enableAnsiOutput, body);

/// Handles the [MinCoverageNotMet] exception by logging the error message.
///
/// If [e] contains uncovered lines, they are logged after the error message.
static void handleMinCoverageNotMet({
/// Logs [error], along with its uncovered lines when it carries any, and
/// returns the exit code an unmet coverage threshold reports.
static int handleMinCoverageNotMet(
MinCoverageNotMet error, {
Comment thread
marcossevilla marked this conversation as resolved.
required Logger logger,
required MinCoverageNotMet e,
double? minCoverage,
}) {
var decimalPlaces = 2;
Expand All @@ -316,22 +315,24 @@ class TestCLIRunner {
return (x * b).roundToDouble() / b;
}

if (e.coverage < minCoverage!) {
var rounded = round(e.coverage);
if (error.coverage < minCoverage!) {
var rounded = round(error.coverage);
while (rounded == minCoverage) {
decimalPlaces++;
rounded = round(e.coverage);
rounded = round(error.coverage);
}
}

logger.err(
'''Expected coverage >= ${minCoverage.toStringAsFixed(decimalPlaces)}% but actual is ${e.coverage.toStringAsFixed(decimalPlaces)}%.''',
'''Expected coverage >= ${minCoverage.toStringAsFixed(decimalPlaces)}% but actual is ${error.coverage.toStringAsFixed(decimalPlaces)}%.''',
);

final uncoveredLines = e.uncoveredLines;
final uncoveredLines = error.uncoveredLines;
if (uncoveredLines != null && uncoveredLines.isNotEmpty) {
logger.err(formatUncoveredLines(uncoveredLines));
}

return ExitCode.software.code;
}

/// Formats a map of uncovered lines into a human-readable string.
Expand Down
103 changes: 52 additions & 51 deletions lib/src/commands/dart/commands/dart_test_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -379,62 +379,63 @@ This command should be run from the root of your Dart project.''');
final config = VeryGoodConfig.load(Directory(targetPath), logger: _logger);
if (config == null) return ExitCode.config.code;

final isDartInstalled = await _dartInstalled(logger: _logger);
if (!await _dartInstalled(logger: _logger)) {
return ExitCode.success.code;
Comment thread
marcossevilla marked this conversation as resolved.
}

final options = DartTestOptions.parse(_argResults, config: config);

if (isDartInstalled) {
try {
final results = await _dartTest(
optimizePerformance:
options.optimizePerformance &&
!TestCLIRunner.isTargettingTestFiles(options.rest) &&
// Disabled optimization when platform is specified
// https://github.com/VeryGoodOpenSource/very_good_cli/issues/1363
options.platform == null,
recursive: recursive,
logger: _logger,
stdout: _logger.write,
stderr: _logger.err,
collectCoverage:
options.collectCoverage ||
options.minCoverage != null ||
options.showUncovered,
minCoverage: options.minCoverage,
showUncovered: options.showUncovered,
excludeFromCoverage: options.excludeFromCoverage,
collectCoverageFrom: options.collectCoverageFrom,
randomSeed: options.randomSeed,
forceAnsi: options.forceAnsi,
arguments: [
if (options.excludeTags != null) ...['-x', options.excludeTags!],
if (options.tags != null) ...['-t', options.tags!],
if (options.failFast) '--fail-fast',
if (options.runSkipped) '--run-skipped',
if (options.platform != null) ...['--platform', options.platform!],
if (options.platform == null) ...['-j', options.concurrency],
if (options.fileReporter != null)
'--file-reporter=${options.fileReporter}',
...options.rest,
],
reportOn: options.reportOn.isEmpty ? null : options.reportOn,
checkIgnore: options.checkIgnore,
);
if (results.any((code) => code != ExitCode.success.code)) {
return ExitCode.unavailable.code;
}
} on MinCoverageNotMet catch (e) {
TestCLIRunner.handleMinCoverageNotMet(
logger: _logger,
minCoverage: options.minCoverage,
e: e,
);
return ExitCode.unavailable.code;
} on Exception catch (error) {
_logger.err('$error');
return ExitCode.unavailable.code;
try {
final results = await _dartTest(
optimizePerformance:
options.optimizePerformance &&
!TestCLIRunner.isTargettingTestFiles(options.rest) &&
// Disabled optimization when platform is specified
// https://github.com/VeryGoodOpenSource/very_good_cli/issues/1363
options.platform == null,
recursive: recursive,
logger: _logger,
stdout: _logger.write,
stderr: _logger.err,
collectCoverage:
options.collectCoverage ||
options.minCoverage != null ||
options.showUncovered,
minCoverage: options.minCoverage,
showUncovered: options.showUncovered,
excludeFromCoverage: options.excludeFromCoverage,
collectCoverageFrom: options.collectCoverageFrom,
randomSeed: options.randomSeed,
forceAnsi: options.forceAnsi,
arguments: [
if (options.excludeTags != null) ...['-x', options.excludeTags!],
if (options.tags != null) ...['-t', options.tags!],
if (options.failFast) '--fail-fast',
if (options.runSkipped) '--run-skipped',
if (options.platform != null) ...['--platform', options.platform!],
if (options.platform == null) ...['-j', options.concurrency],
if (options.fileReporter != null)
'--file-reporter=${options.fileReporter}',
...options.rest,
],
reportOn: options.reportOn.isEmpty ? null : options.reportOn,
checkIgnore: options.checkIgnore,
);

if (results.any((code) => code != ExitCode.success.code)) {
return ExitCode.software.code;
}
} on MinCoverageNotMet catch (error) {
return TestCLIRunner.handleMinCoverageNotMet(
error,
logger: _logger,
minCoverage: options.minCoverage,
);
} on Exception catch (error) {
_logger.err('$error');
return ExitCode.unavailable.code;
}

return ExitCode.success.code;
}
}
Loading
Loading