From a9c50335c736ae6df6338b410602022ab3bced5f Mon Sep 17 00:00:00 2001 From: Andrew Kolos Date: Tue, 28 Jan 2025 09:32:27 -0800 Subject: [PATCH] remove dependency on `Usage` from `Pub` class (#162279) Towards https://github.com/flutter/flutter/issues/150575 Removes more usage of `Usage`. This PR is scoped to removing all references to it in `pub`-related code.
Pre-launch checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- .../flutter_tools/lib/src/context_runner.dart | 1 - packages/flutter_tools/lib/src/dart/pub.dart | 17 --- .../hermetic/analyze_continuously_test.dart | 2 - .../commands.shard/permeable/create_test.dart | 25 ----- .../permeable/packages_test.dart | 19 ---- .../permeable/widget_preview_test.dart | 4 - .../compute_dev_dependencies_test.dart | 2 - .../general.shard/dart/pub_deps_test.dart | 5 - .../test/general.shard/dart/pub_get_test.dart | 101 ------------------ .../web_plugin_registrant_test.dart | 5 - 10 files changed, 181 deletions(-) diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart index e233639378..3e3d30b5f0 100644 --- a/packages/flutter_tools/lib/src/context_runner.dart +++ b/packages/flutter_tools/lib/src/context_runner.dart @@ -328,7 +328,6 @@ Future runInContext(FutureOr Function() runner, {Map? processManager: globals.processManager, botDetector: globals.botDetector, platform: globals.platform, - usage: globals.flutterUsage, ), Stdio: () => Stdio(), SystemClock: () => const SystemClock(), diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart index 3b64f0f98b..5455d41fd7 100644 --- a/packages/flutter_tools/lib/src/dart/pub.dart +++ b/packages/flutter_tools/lib/src/dart/pub.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; import 'package:process/process.dart'; - import '../base/bot_detector.dart'; import '../base/common.dart'; import '../base/context.dart'; @@ -21,7 +20,6 @@ import '../cache.dart'; import '../convert.dart'; import '../dart/package_map.dart'; import '../project.dart'; -import '../reporting/reporting.dart'; import '../version.dart'; /// The [Pub] instance. @@ -113,7 +111,6 @@ abstract class Pub { required ProcessManager processManager, required Platform platform, required BotDetector botDetector, - required Usage usage, }) = _DefaultPub; /// Create a [Pub] instance with a mocked [stdio]. @@ -124,7 +121,6 @@ abstract class Pub { required ProcessManager processManager, required Platform platform, required BotDetector botDetector, - required Usage usage, required Stdio stdio, }) = _DefaultPub.test; @@ -211,12 +207,10 @@ class _DefaultPub implements Pub { required ProcessManager processManager, required Platform platform, required BotDetector botDetector, - required Usage usage, }) : _fileSystem = fileSystem, _logger = logger, _platform = platform, _botDetector = botDetector, - _usage = usage, _processUtils = ProcessUtils(logger: logger, processManager: processManager), _processManager = processManager, _stdio = null; @@ -228,13 +222,11 @@ class _DefaultPub implements Pub { required ProcessManager processManager, required Platform platform, required BotDetector botDetector, - required Usage usage, required Stdio stdio, }) : _fileSystem = fileSystem, _logger = logger, _platform = platform, _botDetector = botDetector, - _usage = usage, _processUtils = ProcessUtils(logger: logger, processManager: processManager), _processManager = processManager, _stdio = stdio; @@ -244,7 +236,6 @@ class _DefaultPub implements Pub { final ProcessUtils _processUtils; final Platform _platform; final BotDetector _botDetector; - final Usage _usage; final ProcessManager _processManager; final Stdio? _stdio; @@ -501,8 +492,6 @@ class _DefaultPub implements Pub { } final int code = exitCode; - final String result = code == 0 ? 'success' : 'failure'; - PubResultEvent(context: context.toAnalyticsString(), result: result, usage: _usage).send(); if (code != 0) { final StringBuffer buffer = StringBuffer('$failureMessage\n'); @@ -581,12 +570,6 @@ class _DefaultPub implements Pub { environment: pubEnvironment, ); - String result = 'success'; - if (code != 0) { - result = 'failure'; - } - PubResultEvent(context: context.toAnalyticsString(), result: result, usage: _usage).send(); - if (code != 0) { final StringBuffer buffer = StringBuffer('$failureMessage\n'); buffer.writeln('command: "${pubCommand.join(' ')}"'); diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart index 76163263bf..db733b2ffb 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart @@ -82,7 +82,6 @@ void main() { processManager: processManager, platform: const LocalPlatform(), botDetector: globals.botDetector, - usage: globals.flutterUsage, stdio: mockStdio, ); await pub.get( @@ -122,7 +121,6 @@ void main() { logger: logger, processManager: processManager, platform: const LocalPlatform(), - usage: globals.flutterUsage, botDetector: globals.botDetector, stdio: mockStdio, ); diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart index d6c6864158..eb459105db 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart @@ -226,7 +226,6 @@ void main() { fileSystem: globals.fs, logger: logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -260,7 +259,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -296,7 +294,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -325,7 +322,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -355,7 +351,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -389,7 +384,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -422,7 +416,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -452,7 +445,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -493,7 +485,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -528,7 +519,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -583,7 +573,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -620,7 +609,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -654,7 +642,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -686,7 +673,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -710,7 +696,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -973,7 +958,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -1770,7 +1754,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -1819,7 +1802,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -2186,7 +2168,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -2216,7 +2197,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -2440,7 +2420,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -2487,7 +2466,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -3880,7 +3858,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -4256,7 +4233,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -4305,7 +4281,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart index 17867bd22c..97d5b9561e 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart @@ -290,7 +290,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -320,7 +319,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -363,7 +361,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, ), @@ -439,7 +436,6 @@ workspace: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -482,7 +478,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, ), @@ -516,7 +511,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -556,7 +550,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -588,7 +581,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -623,7 +615,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -655,7 +646,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -684,7 +674,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -713,7 +702,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -749,7 +737,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -784,7 +771,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -834,7 +820,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -874,7 +859,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -917,7 +901,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -959,7 +942,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -997,7 +979,6 @@ flutter: fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, diff --git a/packages/flutter_tools/test/commands.shard/permeable/widget_preview_test.dart b/packages/flutter_tools/test/commands.shard/permeable/widget_preview_test.dart index 0499df7d8c..3e2c10d34b 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/widget_preview_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/widget_preview_test.dart @@ -113,7 +113,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -136,7 +135,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -157,7 +155,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, @@ -211,7 +208,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: mockStdio, diff --git a/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart b/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart index d21493cd72..4f59e91566 100644 --- a/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart +++ b/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart @@ -10,7 +10,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/compute_dev_dependencies.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/project.dart'; -import 'package:flutter_tools/src/reporting/reporting.dart'; import '../src/common.dart'; import '../src/fake_process_manager.dart'; @@ -46,7 +45,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), diff --git a/packages/flutter_tools/test/general.shard/dart/pub_deps_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_deps_test.dart index af2d57975b..d8306d0bdd 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_deps_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_deps_test.dart @@ -8,7 +8,6 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/project.dart'; -import 'package:flutter_tools/src/reporting/reporting.dart'; import '../../src/common.dart'; import '../../src/fake_process_manager.dart'; @@ -33,7 +32,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -58,7 +56,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -88,7 +85,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -118,7 +114,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart index 19d542e935..2010cd7f54 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart @@ -13,7 +13,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/project.dart'; -import 'package:flutter_tools/src/reporting/reporting.dart'; import '../../src/common.dart'; import '../../src/fake_process_manager.dart'; @@ -36,7 +35,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -91,7 +89,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -147,7 +144,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -203,7 +199,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -236,7 +231,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -268,7 +262,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -313,7 +306,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -359,7 +351,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -406,7 +397,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -451,7 +441,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -498,7 +487,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -546,7 +534,6 @@ void main() { fileSystem: fileSystem, logger: logger, processManager: processManager, - usage: TestUsage(), platform: FakePlatform(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), @@ -592,7 +579,6 @@ void main() { platform: FakePlatform(), fileSystem: fileSystem, logger: logger, - usage: TestUsage(), botDetector: const FakeBotDetector(false), stdio: mockStdio, processManager: processManager, @@ -659,7 +645,6 @@ exit code: 66 platform: FakePlatform(), fileSystem: fileSystem, logger: logger, - usage: TestUsage(), botDetector: const FakeBotDetector(false), processManager: processManager, ); @@ -720,7 +705,6 @@ exit code: 66 platform: FakePlatform(), fileSystem: fileSystem, logger: logger, - usage: TestUsage(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), processManager: processManager, @@ -779,7 +763,6 @@ exit code: 66 platform: FakePlatform(), fileSystem: fileSystem, logger: logger, - usage: TestUsage(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), processManager: processManager, @@ -823,7 +806,6 @@ exit code: 66 final FakeStdio mockStdio = FakeStdio(); final Pub pub = Pub.test( platform: FakePlatform(), - usage: TestUsage(), fileSystem: fileSystem, logger: logger, processManager: processManager, @@ -870,7 +852,6 @@ exit code: 66 final FakeStdio mockStdio = FakeStdio(); final Pub pub = Pub.test( platform: FakePlatform(), - usage: TestUsage(), fileSystem: fileSystem, logger: BufferLogger.test(), processManager: processManager, @@ -939,7 +920,6 @@ exit code: 66 final BufferLogger logger = BufferLogger.test(); final Pub pub = Pub.test( platform: platform, - usage: TestUsage(), fileSystem: fileSystem, logger: logger, processManager: processManager, @@ -985,7 +965,6 @@ exit code: 66 fileSystem: fileSystem, logger: BufferLogger.test(), processManager: processManager, - usage: TestUsage(), botDetector: const FakeBotDetector(false), stdio: mockStdio, platform: FakePlatform( @@ -1008,48 +987,16 @@ exit code: 66 expect(processManager, hasNoRemainingExpectations); }); - testWithoutContext('analytics sent on success', () async { - final FileSystem fileSystem = MemoryFileSystem.test(); - final TestUsage usage = TestUsage(); - final Pub pub = Pub.test( - fileSystem: fileSystem, - logger: BufferLogger.test(), - processManager: FakeProcessManager.any(), - botDetector: const FakeBotDetector(false), - stdio: FakeStdio(), - usage: usage, - platform: FakePlatform( - environment: const {'PUB_CACHE': 'custom/pub-cache/path'}, - ), - ); - fileSystem.file('version').createSync(); - fileSystem.file('pubspec.yaml').createSync(); - fileSystem.file('.dart_tool/package_config.json') - ..createSync(recursive: true) - ..writeAsStringSync('{"configVersion": 2,"packages": []}'); - - await pub.get( - project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory), - context: PubContext.flutterTests, - ); - expect( - usage.events, - contains(const TestUsageEvent('pub-result', 'flutter-tests', label: 'success')), - ); - }); - testWithoutContext( 'package_config_subset file is generated from packages and not timestamp', () async { final FileSystem fileSystem = MemoryFileSystem.test(); - final TestUsage usage = TestUsage(); final Pub pub = Pub.test( fileSystem: fileSystem, logger: BufferLogger.test(), processManager: FakeProcessManager.any(), botDetector: const FakeBotDetector(false), stdio: FakeStdio(), - usage: usage, platform: FakePlatform( environment: const {'PUB_CACHE': 'custom/pub-cache/path'}, ), @@ -1085,53 +1032,6 @@ exit code: 66 }, ); - testWithoutContext('analytics sent on failure', () async { - final FileSystem fileSystem = MemoryFileSystem.test(); - fileSystem.directory('custom/pub-cache/path').createSync(recursive: true); - final TestUsage usage = TestUsage(); - - final FakeProcessManager processManager = FakeProcessManager.list([ - const FakeCommand( - command: [ - 'bin/cache/dart-sdk/bin/dart', - 'pub', - '--suppress-analytics', - '--directory', - '.', - 'get', - '--example', - ], - exitCode: 1, - ), - ]); - - final Pub pub = Pub.test( - usage: usage, - fileSystem: fileSystem, - logger: BufferLogger.test(), - processManager: processManager, - botDetector: const FakeBotDetector(false), - stdio: FakeStdio(), - platform: FakePlatform( - environment: const {'PUB_CACHE': 'custom/pub-cache/path'}, - ), - ); - try { - await pub.get( - project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory), - context: PubContext.flutterTests, - ); - } on ToolExit { - // Ignore. - } - - expect( - usage.events, - contains(const TestUsageEvent('pub-result', 'flutter-tests', label: 'failure')), - ); - expect(processManager, hasNoRemainingExpectations); - }); - testWithoutContext('Pub error handling', () async { final BufferLogger logger = BufferLogger.test(); final MemoryFileSystem fileSystem = MemoryFileSystem.test(); @@ -1188,7 +1088,6 @@ exit code: 66 ), ]); final Pub pub = Pub.test( - usage: TestUsage(), fileSystem: fileSystem, logger: logger, processManager: processManager, diff --git a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart index 263ca24e89..d6f17b515c 100644 --- a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart +++ b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart @@ -87,7 +87,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: globals.stdio, @@ -145,7 +144,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: globals.stdio, @@ -183,7 +181,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: globals.stdio, @@ -221,7 +218,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: globals.stdio, @@ -272,7 +268,6 @@ void main() { fileSystem: globals.fs, logger: globals.logger, processManager: globals.processManager, - usage: globals.flutterUsage, botDetector: globals.botDetector, platform: globals.platform, stdio: globals.stdio,