Skip to content

Commit 53a2171

Browse files
authored
delete references to Usage in config_test.dart (#162648)
Fixes flutter/flutter#162413. Toward flutter/flutter#150575 <details> <summary> Pre-launch checklist </summary> - [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. </details> <!-- Links --> [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
1 parent e7bdde6 commit 53a2171

File tree

1 file changed

+22
-28
lines changed

1 file changed

+22
-28
lines changed

packages/flutter_tools/test/commands.shard/hermetic/config_test.dart

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'package:flutter_tools/src/cache.dart';
1515
import 'package:flutter_tools/src/commands/config.dart';
1616
import 'package:flutter_tools/src/features.dart';
1717
import 'package:flutter_tools/src/globals.dart' as globals;
18-
import 'package:flutter_tools/src/reporting/reporting.dart';
1918
import 'package:flutter_tools/src/version.dart';
2019
import 'package:test/fake.dart';
2120
import 'package:unified_analytics/unified_analytics.dart';
@@ -30,7 +29,6 @@ void main() {
3029
late FakeAndroidStudio fakeAndroidStudio;
3130
late FakeAndroidSdk fakeAndroidSdk;
3231
late FakeFlutterVersion fakeFlutterVersion;
33-
late TestUsage testUsage;
3432
late FakeAnalytics fakeAnalytics;
3533

3634
setUpAll(() {
@@ -42,20 +40,12 @@ void main() {
4240
fakeAndroidStudio = FakeAndroidStudio();
4341
fakeAndroidSdk = FakeAndroidSdk();
4442
fakeFlutterVersion = FakeFlutterVersion();
45-
testUsage = TestUsage();
4643
fakeAnalytics = getInitializedFakeAnalyticsInstance(
4744
fs: MemoryFileSystem.test(),
4845
fakeFlutterVersion: fakes.FakeFlutterVersion(),
4946
);
5047
});
5148

52-
void verifyNoAnalytics() {
53-
expect(testUsage.commands, isEmpty);
54-
expect(testUsage.events, isEmpty);
55-
expect(testUsage.timings, isEmpty);
56-
expect(fakeAnalytics.sentEvents, isEmpty);
57-
}
58-
5949
group('config', () {
6050
testUsingContext('prints all settings with --list', () async {
6151
final ConfigCommand configCommand = ConfigCommand();
@@ -67,7 +57,7 @@ void main() {
6757
'${allFeatures.where((Feature e) => e.configSetting != null).map((Feature e) => ' ${e.configSetting}: (Not set)').join('\n')}'
6858
'\n\n',
6959
);
70-
}, overrides: <Type, Generator>{Usage: () => testUsage});
60+
});
7161

7262
testUsingContext('throws error on excess arguments', () {
7363
final ConfigCommand configCommand = ConfigCommand();
@@ -82,8 +72,8 @@ void main() {
8272
]),
8373
throwsToolExit(),
8474
);
85-
verifyNoAnalytics();
86-
}, overrides: <Type, Generator>{Usage: () => testUsage});
75+
expect(fakeAnalytics.sentEvents, isEmpty);
76+
}, overrides: <Type, Generator>{Analytics: () => fakeAnalytics});
8777

8878
testUsingContext(
8979
'machine flag',
@@ -99,13 +89,13 @@ void main() {
9989
expect(jsonObject['android-sdk'], fakeAndroidSdk.directory.path);
10090
expect(jsonObject['jdk-dir'], fakeJava.javaHome);
10191
}
102-
verifyNoAnalytics();
92+
expect(fakeAnalytics.sentEvents, isEmpty);
10393
},
10494
overrides: <Type, Generator>{
10595
AndroidStudio: () => fakeAndroidStudio,
10696
AndroidSdk: () => fakeAndroidSdk,
10797
Java: () => fakeJava,
108-
Usage: () => testUsage,
98+
Analytics: () => fakeAnalytics,
10999
},
110100
);
111101

@@ -116,16 +106,20 @@ void main() {
116106
await commandRunner.run(<String>['config', '--build-dir=foo']);
117107

118108
expect(getBuildDirectory(), 'foo');
119-
verifyNoAnalytics();
120-
}, overrides: <Type, Generator>{Usage: () => testUsage});
109+
expect(fakeAnalytics.sentEvents, isEmpty);
110+
}, overrides: <Type, Generator>{Analytics: () => fakeAnalytics});
121111

122-
testUsingContext('throws error on absolute path to build-dir', () async {
123-
final ConfigCommand configCommand = ConfigCommand();
124-
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);
112+
testUsingContext(
113+
'throws error on absolute path to build-dir',
114+
() async {
115+
final ConfigCommand configCommand = ConfigCommand();
116+
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);
125117

126-
expect(() => commandRunner.run(<String>['config', '--build-dir=/foo']), throwsToolExit());
127-
verifyNoAnalytics();
128-
}, overrides: <Type, Generator>{Usage: () => testUsage});
118+
expect(() => commandRunner.run(<String>['config', '--build-dir=/foo']), throwsToolExit());
119+
expect(fakeAnalytics.sentEvents, isEmpty);
120+
},
121+
overrides: <Type, Generator>{Analytics: () => fakeAnalytics},
122+
);
129123

130124
testUsingContext(
131125
'allows setting and removing feature flags',
@@ -175,12 +169,12 @@ void main() {
175169
expect(globals.config.getValue('enable-linux-desktop'), false);
176170
expect(globals.config.getValue('enable-windows-desktop'), false);
177171
expect(globals.config.getValue('enable-macos-desktop'), false);
178-
verifyNoAnalytics();
172+
expect(fakeAnalytics.sentEvents, isEmpty);
179173
},
180174
overrides: <Type, Generator>{
181175
AndroidStudio: () => fakeAndroidStudio,
182176
AndroidSdk: () => fakeAndroidSdk,
183-
Usage: () => testUsage,
177+
Analytics: () => fakeAnalytics,
184178
},
185179
);
186180

@@ -194,7 +188,7 @@ void main() {
194188
testLogger.statusText,
195189
containsIgnoringWhitespace('You may need to restart any open editors'),
196190
);
197-
}, overrides: <Type, Generator>{Usage: () => testUsage});
191+
});
198192

199193
testUsingContext(
200194
'displays which config settings are available on stable',
@@ -217,13 +211,13 @@ void main() {
217211
expect(testLogger.statusText, containsIgnoringWhitespace('enable-linux-desktop: true'));
218212
expect(testLogger.statusText, containsIgnoringWhitespace('enable-windows-desktop: true'));
219213
expect(testLogger.statusText, containsIgnoringWhitespace('enable-macos-desktop: true'));
220-
verifyNoAnalytics();
214+
expect(fakeAnalytics.sentEvents, isEmpty);
221215
},
222216
overrides: <Type, Generator>{
223217
AndroidStudio: () => fakeAndroidStudio,
224218
AndroidSdk: () => fakeAndroidSdk,
225219
FlutterVersion: () => fakeFlutterVersion,
226-
Usage: () => testUsage,
220+
Analytics: () => fakeAnalytics,
227221
},
228222
);
229223

0 commit comments

Comments
 (0)