From cdcfc0fc8becdf0133276c9b695b771a32af191f Mon Sep 17 00:00:00 2001 From: Qun Cheng Date: Wed, 24 Jun 2026 14:46:27 -0700 Subject: [PATCH 1/3] Remove widgets import --- .../temporarily_disabled_tests/scaffold_test.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart b/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart index 04e3f1e3f6f4..5d47a302db97 100644 --- a/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart +++ b/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -@Skip( - 'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.', -) import 'dart:math' as math; import 'package:flutter/foundation.dart'; @@ -15,7 +12,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart'; -import '../widgets/semantics_tester.dart'; +import '../test/semantics_tester.dart'; // From bottom_sheet.dart. const Duration _bottomSheetExitDuration = Duration(milliseconds: 200); From daa9a23be7c355ddfae4bb9080cad92072423f08 Mon Sep 17 00:00:00 2001 From: Qun Cheng Date: Wed, 24 Jun 2026 14:58:45 -0700 Subject: [PATCH 2/3] Move the file to test folder --- .../{temporarily_disabled_tests => test}/scaffold_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename packages/material_ui/{temporarily_disabled_tests => test}/scaffold_test.dart (99%) diff --git a/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart b/packages/material_ui/test/scaffold_test.dart similarity index 99% rename from packages/material_ui/temporarily_disabled_tests/scaffold_test.dart rename to packages/material_ui/test/scaffold_test.dart index 5d47a302db97..419d15cdb0b5 100644 --- a/packages/material_ui/temporarily_disabled_tests/scaffold_test.dart +++ b/packages/material_ui/test/scaffold_test.dart @@ -6,13 +6,13 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart' show DragStartBehavior; -import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart'; +import 'package:material_ui/material_ui.dart'; -import '../test/semantics_tester.dart'; +import 'semantics_tester.dart'; // From bottom_sheet.dart. const Duration _bottomSheetExitDuration = Duration(milliseconds: 200); From 5cc4ae96b3a920ca4d80fd045e90d903444788d0 Mon Sep 17 00:00:00 2001 From: Qun Cheng Date: Wed, 24 Jun 2026 15:59:21 -0700 Subject: [PATCH 3/3] Fix linux analyze stable --- packages/material_ui/test/scaffold_test.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/material_ui/test/scaffold_test.dart b/packages/material_ui/test/scaffold_test.dart index 419d15cdb0b5..ae0029b42b0e 100644 --- a/packages/material_ui/test/scaffold_test.dart +++ b/packages/material_ui/test/scaffold_test.dart @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'dart:async' show unawaited; import 'dart:math' as math; import 'package:flutter/foundation.dart'; @@ -1078,7 +1079,7 @@ void main() { }; await tester.pumpWidget(MaterialApp(routes: routes)); - Navigator.pushNamed(rootKey.currentContext!, '/scaffold'); + unawaited(Navigator.pushNamed(rootKey.currentContext!, '/scaffold')); await tester.pump(); await tester.pump(const Duration(seconds: 1)); @@ -1122,7 +1123,7 @@ void main() { ), ); - tester.state(find.byType(Navigator)).push(routeBuilder()); + unawaited(tester.state(find.byType(Navigator)).push(routeBuilder())); await tester.pump(); await tester.pump(const Duration(seconds: 1));