@@ -13,26 +13,30 @@ import 'package:flutter_tools/src/base/platform.dart';
1313import 'package:flutter_tools/src/doctor.dart' ;
1414import 'package:flutter_tools/src/project.dart' ;
1515import 'package:flutter_tools/src/reporting/crash_reporting.dart' ;
16- import 'package:flutter_tools/src/reporting/reporting.dart' ;
1716import 'package:http/http.dart' ;
1817import 'package:http/testing.dart' ;
1918import 'package:test/fake.dart' ;
19+ import 'package:unified_analytics/unified_analytics.dart' ;
2020
2121import '../src/common.dart' ;
2222import '../src/fake_process_manager.dart' ;
23+ import '../src/fakes.dart' ;
2324
2425void main () {
2526 late BufferLogger logger;
26- late FileSystem fs;
27- late TestUsage testUsage;
27+ late MemoryFileSystem fs;
2828 late Platform platform;
2929 late OperatingSystemUtils operatingSystemUtils;
3030 late StackTrace stackTrace;
31+ late FakeAnalytics fakeAnalytics;
3132
3233 setUp (() async {
3334 logger = BufferLogger .test ();
3435 fs = MemoryFileSystem .test ();
35- testUsage = TestUsage ();
36+ fakeAnalytics = getInitializedFakeAnalyticsInstance (
37+ fs: fs,
38+ fakeFlutterVersion: FakeFlutterVersion (),
39+ );
3640
3741 platform = FakePlatform (environment: < String , String > {});
3842 operatingSystemUtils = OperatingSystemUtils (
@@ -63,7 +67,7 @@ void main() {
6367 'version' : 'test-version' ,
6468 },
6569 ));
66- expect (crashInfo.fields? ['uuid' ], testUsage .clientId);
70+ expect (crashInfo.fields? ['uuid' ], fakeAnalytics .clientId);
6771 expect (crashInfo.fields? ['product' ], 'Flutter_Tools' );
6872 expect (crashInfo.fields? ['version' ], 'test-version' );
6973 expect (crashInfo.fields? ['osName' ], 'linux' );
@@ -104,14 +108,14 @@ void main() {
104108 });
105109
106110 testWithoutContext ('suppress analytics' , () async {
107- testUsage.suppressAnalytics = true ;
111+ fakeAnalytics. suppressTelemetry () ;
108112
109113 final CrashReportSender crashReportSender = CrashReportSender (
110114 client: CrashingCrashReportSender (const SocketException ('no internets' )),
111- usage: testUsage,
112115 platform: platform,
113116 logger: logger,
114117 operatingSystemUtils: operatingSystemUtils,
118+ analytics: fakeAnalytics,
115119 );
116120
117121 await crashReportSender.sendReport (
@@ -126,18 +130,18 @@ void main() {
126130
127131 group ('allow analytics' , () {
128132 setUp (() async {
129- testUsage.suppressAnalytics = false ;
133+ await fakeAnalytics. setTelemetry ( true ) ;
130134 });
131135
132136 testWithoutContext ('should send crash reports' , () async {
133137 final RequestInfo requestInfo = RequestInfo ();
134138
135139 final CrashReportSender crashReportSender = CrashReportSender (
136140 client: MockCrashReportSender (requestInfo),
137- usage: testUsage,
138141 platform: platform,
139142 logger: logger,
140143 operatingSystemUtils: operatingSystemUtils,
144+ analytics: fakeAnalytics,
141145 );
142146
143147 await crashReportSender.sendReport (
@@ -153,10 +157,10 @@ void main() {
153157 testWithoutContext ('should print an explanatory message when there is a SocketException' , () async {
154158 final CrashReportSender crashReportSender = CrashReportSender (
155159 client: CrashingCrashReportSender (const SocketException ('no internets' )),
156- usage: testUsage,
157160 platform: platform,
158161 logger: logger,
159162 operatingSystemUtils: operatingSystemUtils,
163+ analytics: fakeAnalytics,
160164 );
161165
162166 await crashReportSender.sendReport (
@@ -172,10 +176,10 @@ void main() {
172176 testWithoutContext ('should print an explanatory message when there is an HttpException' , () async {
173177 final CrashReportSender crashReportSender = CrashReportSender (
174178 client: CrashingCrashReportSender (const HttpException ('no internets' )),
175- usage: testUsage,
176179 platform: platform,
177180 logger: logger,
178181 operatingSystemUtils: operatingSystemUtils,
182+ analytics: fakeAnalytics,
179183 );
180184
181185 await crashReportSender.sendReport (
@@ -191,10 +195,10 @@ void main() {
191195 testWithoutContext ('should print an explanatory message when there is a ClientException' , () async {
192196 final CrashReportSender crashReportSender = CrashReportSender (
193197 client: CrashingCrashReportSender (const HttpException ('no internets' )),
194- usage: testUsage,
195198 platform: platform,
196199 logger: logger,
197200 operatingSystemUtils: operatingSystemUtils,
201+ analytics: fakeAnalytics,
198202 );
199203
200204 await crashReportSender.sendReport (
@@ -212,10 +216,10 @@ void main() {
212216
213217 final CrashReportSender crashReportSender = CrashReportSender (
214218 client: MockCrashReportSender (requestInfo),
215- usage: testUsage,
216219 platform: platform,
217220 logger: logger,
218221 operatingSystemUtils: operatingSystemUtils,
222+ analytics: fakeAnalytics,
219223 );
220224
221225 await crashReportSender.sendReport (
@@ -266,10 +270,10 @@ void main() {
266270
267271 final CrashReportSender crashReportSender = CrashReportSender (
268272 client: mockClient,
269- usage: testUsage,
270273 platform: platform,
271274 logger: logger,
272275 operatingSystemUtils: operatingSystemUtils,
276+ analytics: fakeAnalytics,
273277 );
274278
275279 await crashReportSender.sendReport (
@@ -303,10 +307,10 @@ void main() {
303307
304308 final CrashReportSender crashReportSender = CrashReportSender (
305309 client: mockClient,
306- usage: testUsage,
307310 platform: environmentPlatform,
308311 logger: logger,
309312 operatingSystemUtils: operatingSystemUtils,
313+ analytics: fakeAnalytics,
310314 );
311315
312316 await crashReportSender.sendReport (
0 commit comments