@@ -15,7 +15,6 @@ import 'package:flutter_tools/src/cache.dart';
15
15
import 'package:flutter_tools/src/commands/config.dart' ;
16
16
import 'package:flutter_tools/src/features.dart' ;
17
17
import 'package:flutter_tools/src/globals.dart' as globals;
18
- import 'package:flutter_tools/src/reporting/reporting.dart' ;
19
18
import 'package:flutter_tools/src/version.dart' ;
20
19
import 'package:test/fake.dart' ;
21
20
import 'package:unified_analytics/unified_analytics.dart' ;
@@ -30,7 +29,6 @@ void main() {
30
29
late FakeAndroidStudio fakeAndroidStudio;
31
30
late FakeAndroidSdk fakeAndroidSdk;
32
31
late FakeFlutterVersion fakeFlutterVersion;
33
- late TestUsage testUsage;
34
32
late FakeAnalytics fakeAnalytics;
35
33
36
34
setUpAll (() {
@@ -42,20 +40,12 @@ void main() {
42
40
fakeAndroidStudio = FakeAndroidStudio ();
43
41
fakeAndroidSdk = FakeAndroidSdk ();
44
42
fakeFlutterVersion = FakeFlutterVersion ();
45
- testUsage = TestUsage ();
46
43
fakeAnalytics = getInitializedFakeAnalyticsInstance (
47
44
fs: MemoryFileSystem .test (),
48
45
fakeFlutterVersion: fakes.FakeFlutterVersion (),
49
46
);
50
47
});
51
48
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
-
59
49
group ('config' , () {
60
50
testUsingContext ('prints all settings with --list' , () async {
61
51
final ConfigCommand configCommand = ConfigCommand ();
@@ -67,7 +57,7 @@ void main() {
67
57
'${allFeatures .where ((Feature e ) => e .configSetting != null ).map ((Feature e ) => ' ${e .configSetting }: (Not set)' ).join ('\n ' )}'
68
58
'\n\n ' ,
69
59
);
70
- }, overrides : < Type , Generator > { Usage : () => testUsage} );
60
+ });
71
61
72
62
testUsingContext ('throws error on excess arguments' , () {
73
63
final ConfigCommand configCommand = ConfigCommand ();
@@ -82,8 +72,8 @@ void main() {
82
72
]),
83
73
throwsToolExit (),
84
74
);
85
- verifyNoAnalytics ( );
86
- }, overrides: < Type , Generator > {Usage : () => testUsage });
75
+ expect (fakeAnalytics.sentEvents, isEmpty );
76
+ }, overrides: < Type , Generator > {Analytics : () => fakeAnalytics });
87
77
88
78
testUsingContext (
89
79
'machine flag' ,
@@ -99,13 +89,13 @@ void main() {
99
89
expect (jsonObject['android-sdk' ], fakeAndroidSdk.directory.path);
100
90
expect (jsonObject['jdk-dir' ], fakeJava.javaHome);
101
91
}
102
- verifyNoAnalytics ( );
92
+ expect (fakeAnalytics.sentEvents, isEmpty );
103
93
},
104
94
overrides: < Type , Generator > {
105
95
AndroidStudio : () => fakeAndroidStudio,
106
96
AndroidSdk : () => fakeAndroidSdk,
107
97
Java : () => fakeJava,
108
- Usage : () => testUsage ,
98
+ Analytics : () => fakeAnalytics ,
109
99
},
110
100
);
111
101
@@ -116,16 +106,20 @@ void main() {
116
106
await commandRunner.run (< String > ['config' , '--build-dir=foo' ]);
117
107
118
108
expect (getBuildDirectory (), 'foo' );
119
- verifyNoAnalytics ( );
120
- }, overrides: < Type , Generator > {Usage : () => testUsage });
109
+ expect (fakeAnalytics.sentEvents, isEmpty );
110
+ }, overrides: < Type , Generator > {Analytics : () => fakeAnalytics });
121
111
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);
125
117
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
+ );
129
123
130
124
testUsingContext (
131
125
'allows setting and removing feature flags' ,
@@ -175,12 +169,12 @@ void main() {
175
169
expect (globals.config.getValue ('enable-linux-desktop' ), false );
176
170
expect (globals.config.getValue ('enable-windows-desktop' ), false );
177
171
expect (globals.config.getValue ('enable-macos-desktop' ), false );
178
- verifyNoAnalytics ( );
172
+ expect (fakeAnalytics.sentEvents, isEmpty );
179
173
},
180
174
overrides: < Type , Generator > {
181
175
AndroidStudio : () => fakeAndroidStudio,
182
176
AndroidSdk : () => fakeAndroidSdk,
183
- Usage : () => testUsage ,
177
+ Analytics : () => fakeAnalytics ,
184
178
},
185
179
);
186
180
@@ -194,7 +188,7 @@ void main() {
194
188
testLogger.statusText,
195
189
containsIgnoringWhitespace ('You may need to restart any open editors' ),
196
190
);
197
- }, overrides : < Type , Generator > { Usage : () => testUsage} );
191
+ });
198
192
199
193
testUsingContext (
200
194
'displays which config settings are available on stable' ,
@@ -217,13 +211,13 @@ void main() {
217
211
expect (testLogger.statusText, containsIgnoringWhitespace ('enable-linux-desktop: true' ));
218
212
expect (testLogger.statusText, containsIgnoringWhitespace ('enable-windows-desktop: true' ));
219
213
expect (testLogger.statusText, containsIgnoringWhitespace ('enable-macos-desktop: true' ));
220
- verifyNoAnalytics ( );
214
+ expect (fakeAnalytics.sentEvents, isEmpty );
221
215
},
222
216
overrides: < Type , Generator > {
223
217
AndroidStudio : () => fakeAndroidStudio,
224
218
AndroidSdk : () => fakeAndroidSdk,
225
219
FlutterVersion : () => fakeFlutterVersion,
226
- Usage : () => testUsage ,
220
+ Analytics : () => fakeAnalytics ,
227
221
},
228
222
);
229
223
0 commit comments