@@ -159,9 +159,8 @@ class FakeCustomBrowserDevice extends Fake implements ChromiumDevice {
159159}
160160
161161class FakeResidentRunner extends Fake implements ResidentRunner {
162- FakeResidentRunner ({this .onRestart, this . waitForAppToFinishCompleter});
162+ FakeResidentRunner ({this .waitForAppToFinishCompleter});
163163
164- final OperationResult Function (bool fullRestart)? onRestart;
165164 final Completer <int >? waitForAppToFinishCompleter;
166165 int restartCount = 0 ;
167166 int concurrentRestarts = 0 ;
@@ -200,7 +199,7 @@ class FakeResidentRunner extends Fake implements ResidentRunner {
200199 await currentRestartCompleter! .future;
201200 }
202201 concurrentRestarts-- ;
203- return onRestart ? . call (fullRestart) ?? OperationResult .ok;
202+ return OperationResult .ok;
204203 }
205204
206205 @override
@@ -1140,19 +1139,7 @@ List<_i1.WidgetPreview> previews() => [
11401139 'serializes, coalesces, and gates reloads across previewer lifecycle' ,
11411140 () async {
11421141 final Directory rootProject = await createRootProject ();
1143- var rejectNextHotReload = false ;
11441142 final fakeResidentRunner = FakeResidentRunner (
1145- onRestart: (bool fullRestart) {
1146- if (! fullRestart && rejectNextHotReload) {
1147- rejectNextHotReload = false ;
1148- return OperationResult (
1149- 1 ,
1150- 'Failed to recompile application.' ,
1151- updateFSReport: UpdateFSReport (hotReloadRejected: true ),
1152- );
1153- }
1154- return OperationResult .ok;
1155- },
11561143 waitForAppToFinishCompleter: Completer <int >(),
11571144 );
11581145
@@ -1256,35 +1243,13 @@ List<_i1.WidgetPreview> previews() => [
12561243 expect (fakeResidentRunner.maxConcurrentRestarts, 1 );
12571244 expect (fakeResidentRunner.fullRestartRequests, < bool > [false , false , false , false , true ]);
12581245
1259- // 4. A rejected hot reload falls back to a hot restart under the mutex,
1260- // before any reload queued while the rejected reload was in flight.
1261- rejectNextHotReload = true ;
1262- final rejectedReloadCompleter = Completer <OperationResult >();
1263- fakeResidentRunner.currentRestartCompleter = rejectedReloadCompleter;
1264-
1265- triggerChange ();
1266- await pumpEventQueue ();
1267- triggerChange ();
1268-
1269- fakeResidentRunner.currentRestartCompleter = null ;
1270- rejectedReloadCompleter.complete (OperationResult .ok);
1271- await pumpEventQueue ();
1272-
1273- expect (fakeResidentRunner.restartCount, 8 );
1274- expect (fakeResidentRunner.maxConcurrentRestarts, 1 );
1275- expect (fakeResidentRunner.fullRestartRequests.skip (5 ), < bool > [false , true , false ]);
1276- expect (
1277- asLogger <BufferLogger >(logger).statusText,
1278- contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage),
1279- );
1280-
1281- // 5. Ignore reload requests after the previewer has finished.
1246+ // 4. Ignore reload requests after the previewer has finished.
12821247 fakeResidentRunner.waitForAppToFinishCompleter! .complete (0 );
12831248 await runFuture;
12841249
12851250 triggerChange ();
12861251 await pumpEventQueue ();
1287- expect (fakeResidentRunner.restartCount, 8 );
1252+ expect (fakeResidentRunner.restartCount, 5 );
12881253 },
12891254 overrides: < Type , Generator > {
12901255 Analytics : () => fakeAnalytics,
@@ -1301,87 +1266,5 @@ List<_i1.WidgetPreview> previews() => [
13011266 ),
13021267 },
13031268 );
1304-
1305- WidgetPreviewStartCommand createStartCommand (FakeResidentRunner runner) {
1306- final command = WidgetPreviewCommand (
1307- toolContext: FakeToolContext (
1308- fs: fs,
1309- logger: logger,
1310- processManager: loggingProcessManager,
1311- platform: platform,
1312- artifacts: Artifacts .test (),
1313- ),
1314- dtdServicesOverride: fakeDtdServices,
1315- );
1316- return (command.subcommands['start' ]! as WidgetPreviewStartCommand )
1317- ..widgetPreviewApp = runner;
1318- }
1319-
1320- testWithoutContext ('triggers hot restart if hot reload is rejected' , () async {
1321- final fakeResidentRunner = FakeResidentRunner (
1322- onRestart: (bool fullRestart) {
1323- if (! fullRestart) {
1324- return OperationResult (
1325- 1 ,
1326- 'Failed to recompile application.' ,
1327- updateFSReport: UpdateFSReport (hotReloadRejected: true ),
1328- );
1329- }
1330- return OperationResult .ok;
1331- },
1332- );
1333- final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1334-
1335- final OperationResult ? result = await startCommand.handleReload ();
1336-
1337- final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1338- expect (fakeResidentRunner.fullRestartRequests, < bool > [false , true ]);
1339- expect (result? .isOk, isTrue);
1340- expect (
1341- bufferLogger.statusText,
1342- contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage),
1343- );
1344- });
1345-
1346- testWithoutContext (
1347- 'does not trigger hot restart if hot reload fails for other reasons' ,
1348- () async {
1349- final fakeResidentRunner = FakeResidentRunner (
1350- onRestart: (bool fullRestart) {
1351- return OperationResult (
1352- 1 ,
1353- 'Failed to recompile application.' ,
1354- updateFSReport: UpdateFSReport (),
1355- );
1356- },
1357- );
1358- final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1359-
1360- final OperationResult ? result = await startCommand.handleReload ();
1361-
1362- final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1363- expect (fakeResidentRunner.fullRestartRequests, < bool > [false ]);
1364- expect (result? .isOk, isFalse);
1365- expect (
1366- bufferLogger.statusText,
1367- isNot (contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage)),
1368- );
1369- },
1370- );
1371-
1372- testWithoutContext ('does not trigger hot restart if hot reload succeeds' , () async {
1373- final fakeResidentRunner = FakeResidentRunner ();
1374- final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1375-
1376- final OperationResult ? result = await startCommand.handleReload ();
1377-
1378- final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1379- expect (fakeResidentRunner.fullRestartRequests, < bool > [false ]);
1380- expect (result? .isOk, isTrue);
1381- expect (
1382- bufferLogger.statusText,
1383- isNot (contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage)),
1384- );
1385- });
13861269 });
13871270}
0 commit comments