@@ -156,8 +156,9 @@ class FakeCustomBrowserDevice extends Fake implements ChromiumDevice {
156156}
157157
158158class FakeResidentRunner extends Fake implements ResidentRunner {
159- FakeResidentRunner ({this .waitForAppToFinishCompleter});
159+ FakeResidentRunner ({this .onRestart, this . waitForAppToFinishCompleter});
160160
161+ final OperationResult Function (bool fullRestart)? onRestart;
161162 final Completer <int >? waitForAppToFinishCompleter;
162163 int restartCount = 0 ;
163164 int concurrentRestarts = 0 ;
@@ -196,7 +197,7 @@ class FakeResidentRunner extends Fake implements ResidentRunner {
196197 await currentRestartCompleter! .future;
197198 }
198199 concurrentRestarts-- ;
199- return OperationResult .ok;
200+ return onRestart ? . call (fullRestart) ?? OperationResult .ok;
200201 }
201202
202203 @override
@@ -1134,7 +1135,19 @@ List<_i1.WidgetPreview> previews() => [
11341135 'serializes, coalesces, and gates reloads across previewer lifecycle' ,
11351136 () async {
11361137 final Directory rootProject = await createRootProject ();
1138+ var rejectNextHotReload = false ;
11371139 final fakeResidentRunner = FakeResidentRunner (
1140+ onRestart: (bool fullRestart) {
1141+ if (! fullRestart && rejectNextHotReload) {
1142+ rejectNextHotReload = false ;
1143+ return OperationResult (
1144+ 1 ,
1145+ 'Failed to recompile application.' ,
1146+ updateFSReport: UpdateFSReport (hotReloadRejected: true ),
1147+ );
1148+ }
1149+ return OperationResult .ok;
1150+ },
11381151 waitForAppToFinishCompleter: Completer <int >(),
11391152 );
11401153
@@ -1238,13 +1251,35 @@ List<_i1.WidgetPreview> previews() => [
12381251 expect (fakeResidentRunner.maxConcurrentRestarts, 1 );
12391252 expect (fakeResidentRunner.fullRestartRequests, < bool > [false , false , false , false , true ]);
12401253
1241- // 4. Ignore reload requests after the previewer has finished.
1254+ // 4. A rejected hot reload falls back to a hot restart under the mutex,
1255+ // before any reload queued while the rejected reload was in flight.
1256+ rejectNextHotReload = true ;
1257+ final rejectedReloadCompleter = Completer <OperationResult >();
1258+ fakeResidentRunner.currentRestartCompleter = rejectedReloadCompleter;
1259+
1260+ triggerChange ();
1261+ await pumpEventQueue ();
1262+ triggerChange ();
1263+
1264+ fakeResidentRunner.currentRestartCompleter = null ;
1265+ rejectedReloadCompleter.complete (OperationResult .ok);
1266+ await pumpEventQueue ();
1267+
1268+ expect (fakeResidentRunner.restartCount, 8 );
1269+ expect (fakeResidentRunner.maxConcurrentRestarts, 1 );
1270+ expect (fakeResidentRunner.fullRestartRequests.skip (5 ), < bool > [false , true , false ]);
1271+ expect (
1272+ asLogger <BufferLogger >(logger).statusText,
1273+ contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage),
1274+ );
1275+
1276+ // 5. Ignore reload requests after the previewer has finished.
12421277 fakeResidentRunner.waitForAppToFinishCompleter! .complete (0 );
12431278 await runFuture;
12441279
12451280 triggerChange ();
12461281 await pumpEventQueue ();
1247- expect (fakeResidentRunner.restartCount, 5 );
1282+ expect (fakeResidentRunner.restartCount, 8 );
12481283 },
12491284 overrides: < Type , Generator > {
12501285 Analytics : () => fakeAnalytics,
@@ -1261,5 +1296,87 @@ List<_i1.WidgetPreview> previews() => [
12611296 ),
12621297 },
12631298 );
1299+
1300+ WidgetPreviewStartCommand createStartCommand (FakeResidentRunner runner) {
1301+ final command = WidgetPreviewCommand (
1302+ toolContext: FakeToolContext (
1303+ fs: fs,
1304+ logger: logger,
1305+ processManager: loggingProcessManager,
1306+ platform: platform,
1307+ artifacts: Artifacts .test (),
1308+ ),
1309+ dtdServicesOverride: fakeDtdServices,
1310+ );
1311+ return (command.subcommands['start' ]! as WidgetPreviewStartCommand )
1312+ ..widgetPreviewApp = runner;
1313+ }
1314+
1315+ testWithoutContext ('triggers hot restart if hot reload is rejected' , () async {
1316+ final fakeResidentRunner = FakeResidentRunner (
1317+ onRestart: (bool fullRestart) {
1318+ if (! fullRestart) {
1319+ return OperationResult (
1320+ 1 ,
1321+ 'Failed to recompile application.' ,
1322+ updateFSReport: UpdateFSReport (hotReloadRejected: true ),
1323+ );
1324+ }
1325+ return OperationResult .ok;
1326+ },
1327+ );
1328+ final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1329+
1330+ final OperationResult ? result = await startCommand.handleReload ();
1331+
1332+ final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1333+ expect (fakeResidentRunner.fullRestartRequests, < bool > [false , true ]);
1334+ expect (result? .isOk, isTrue);
1335+ expect (
1336+ bufferLogger.statusText,
1337+ contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage),
1338+ );
1339+ });
1340+
1341+ testWithoutContext (
1342+ 'does not trigger hot restart if hot reload fails for other reasons' ,
1343+ () async {
1344+ final fakeResidentRunner = FakeResidentRunner (
1345+ onRestart: (bool fullRestart) {
1346+ return OperationResult (
1347+ 1 ,
1348+ 'Failed to recompile application.' ,
1349+ updateFSReport: UpdateFSReport (),
1350+ );
1351+ },
1352+ );
1353+ final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1354+
1355+ final OperationResult ? result = await startCommand.handleReload ();
1356+
1357+ final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1358+ expect (fakeResidentRunner.fullRestartRequests, < bool > [false ]);
1359+ expect (result? .isOk, isFalse);
1360+ expect (
1361+ bufferLogger.statusText,
1362+ isNot (contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage)),
1363+ );
1364+ },
1365+ );
1366+
1367+ testWithoutContext ('does not trigger hot restart if hot reload succeeds' , () async {
1368+ final fakeResidentRunner = FakeResidentRunner ();
1369+ final WidgetPreviewStartCommand startCommand = createStartCommand (fakeResidentRunner);
1370+
1371+ final OperationResult ? result = await startCommand.handleReload ();
1372+
1373+ final BufferLogger bufferLogger = asLogger <BufferLogger >(logger);
1374+ expect (fakeResidentRunner.fullRestartRequests, < bool > [false ]);
1375+ expect (result? .isOk, isTrue);
1376+ expect (
1377+ bufferLogger.statusText,
1378+ isNot (contains (WidgetPreviewStartCommand .kHotReloadRejectedMessage)),
1379+ );
1380+ });
12641381 });
12651382}
0 commit comments