| Index: pkg/analyzer_cli/test/options_test.dart
|
| diff --git a/pkg/analyzer_cli/test/options_test.dart b/pkg/analyzer_cli/test/options_test.dart
|
| index 39e863a68edebb8f8091ae2fa08f1b1635966ec0..6e0f4cdf85e9ab711a3e2e97e5a9d243ba844bf5 100644
|
| --- a/pkg/analyzer_cli/test/options_test.dart
|
| +++ b/pkg/analyzer_cli/test/options_test.dart
|
| @@ -19,6 +19,12 @@ main() {
|
| CommandLineOptions options =
|
| CommandLineOptions.parse(['--dart-sdk', '.', 'foo.dart']);
|
| expect(options, isNotNull);
|
| + expect(options.buildMode, isFalse);
|
| + expect(options.buildAnalysisOutput, isNull);
|
| + expect(options.buildSummaryInputs, isEmpty);
|
| + expect(options.buildSummaryOnly, isFalse);
|
| + expect(options.buildSummaryOutput, isNull);
|
| + expect(options.buildSuppressExitCode, isFalse);
|
| expect(options.dartSdkPath, isNotNull);
|
| expect(options.disableHints, isFalse);
|
| expect(options.lints, isFalse);
|
| @@ -31,9 +37,7 @@ main() {
|
| expect(options.ignoreUnrecognizedFlags, isFalse);
|
| expect(options.log, isFalse);
|
| expect(options.machineFormat, isFalse);
|
| - expect(options.packageMode, isFalse);
|
| expect(options.packageRootPath, isNull);
|
| - expect(options.packageSummaryInputs, isEmpty);
|
| expect(options.shouldBatch, isFalse);
|
| expect(options.showPackageWarnings, isFalse);
|
| expect(options.showSdkWarnings, isFalse);
|
| @@ -231,45 +235,73 @@ class AbstractStatusTest {
|
| class CommandLineOptionsTest extends AbstractStatusTest {
|
| CommandLineOptions options;
|
|
|
| - test_packageMode() {
|
| - _parse(['--package-mode', '/path/to/pkg']);
|
| - expect(options.packageMode, isTrue);
|
| - print(options.packageSummaryInputs);
|
| + test_buildAnalysisOutput() {
|
| + _parse([
|
| + '--build-mode',
|
| + '--build-analysis-output=//path/to/output.analysis',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| + ]);
|
| + expect(options.buildMode, isTrue);
|
| + expect(options.buildAnalysisOutput, '//path/to/output.analysis');
|
| + }
|
| +
|
| + test_buildMode() {
|
| + _parse(['--build-mode', 'package:p/foo.dart|/path/to/p/lib/foo.dart']);
|
| + expect(options.buildMode, isTrue);
|
| + }
|
| +
|
| + test_buildSummaryInputs_commaSeparated() {
|
| + _parse([
|
| + '--build-mode',
|
| + '--build-summary-input=/path/to/aaa.sum,/path/to/bbb.sum',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| + ]);
|
| + expect(options.buildMode, isTrue);
|
| + expect(
|
| + options.buildSummaryInputs, ['/path/to/aaa.sum', '/path/to/bbb.sum']);
|
| + }
|
| +
|
| + test_buildSummaryInputs_separateFlags() {
|
| + _parse([
|
| + '--build-mode',
|
| + '--build-summary-input=/path/to/aaa.sum',
|
| + '--build-summary-input=/path/to/bbb.sum',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| + ]);
|
| + expect(options.buildMode, isTrue);
|
| + expect(
|
| + options.buildSummaryInputs, ['/path/to/aaa.sum', '/path/to/bbb.sum']);
|
| }
|
|
|
| - test_packageSummaryInput() {
|
| + test_buildSummaryOnly() {
|
| _parse([
|
| - '--package-mode',
|
| - '--package-summary-input=aaa,/path/to/aaa.sum',
|
| - '--package-summary-input=long.package.bbb,/path/to/bbb.sum',
|
| - '/path/to/pkg'
|
| + '--build-mode',
|
| + '--build-summary-output=/path/to/aaa.sum',
|
| + '--build-summary-only',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| ]);
|
| - expect(options.packageMode, isTrue);
|
| - Map<String, String> map = options.packageSummaryInputs;
|
| - expect(map, hasLength(2));
|
| - expect(map, containsPair('aaa', '/path/to/aaa.sum'));
|
| - expect(map, containsPair('long.package.bbb', '/path/to/bbb.sum'));
|
| + expect(options.buildMode, isTrue);
|
| + expect(options.buildSummaryOnly, isTrue);
|
| }
|
|
|
| - test_packageSummaryInput_noComma() {
|
| + test_buildSummaryOutput() {
|
| _parse([
|
| - '--package-mode',
|
| - '--package-summary-input=noCommaInMapping',
|
| - '/path/to/pkg'
|
| + '--build-mode',
|
| + '--build-summary-output=//path/to/output.sum',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| ]);
|
| - expect(lastExitHandlerCode, 15);
|
| - expect(errorStringBuffer.toString(), contains('--package-summary-input'));
|
| - expect(errorStringBuffer.toString(), contains('noCommaInMapping'));
|
| + expect(options.buildMode, isTrue);
|
| + expect(options.buildSummaryOutput, '//path/to/output.sum');
|
| }
|
|
|
| - test_packageSummaryOutput() {
|
| + test_buildSuppressExitCode() {
|
| _parse([
|
| - '--package-mode',
|
| - '--package-summary-output=/path/to/output.sum',
|
| - '/path/to/pkg'
|
| + '--build-mode',
|
| + '--build-suppress-exit-code',
|
| + 'package:p/foo.dart|/path/to/p/lib/foo.dart'
|
| ]);
|
| - expect(options.packageMode, isTrue);
|
| - expect(options.packageSummaryOutput, '/path/to/output.sum');
|
| + expect(options.buildMode, isTrue);
|
| + expect(options.buildSuppressExitCode, isTrue);
|
| }
|
|
|
| void _parse(List<String> args) {
|
|
|