From be3d1762cc0569ce3bf651cb6424fe8dcb55e2fc Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Jul 2023 14:13:13 -0400 Subject: [PATCH 1/3] Roll to 3 days ago --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 241b18780c5..717f6c69d3e 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -c40173f114fa8b830531578586f4f4eedd2b2c1f +f842ed916514879fe6898b2a5a4053c63c3308fe From 0c54586e2f4b03aaeff81f8864ac0e0008188de5 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Jul 2023 14:32:58 -0400 Subject: [PATCH 2/3] Make tests handle M3 --- .../example/test/wrap_example_test.dart | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/packages/dynamic_layouts/example/test/wrap_example_test.dart b/packages/dynamic_layouts/example/test/wrap_example_test.dart index 03dfabdc0a7..8fb31b8d13d 100644 --- a/packages/dynamic_layouts/example/test/wrap_example_test.dart +++ b/packages/dynamic_layouts/example/test/wrap_example_test.dart @@ -9,11 +9,10 @@ import 'package:flutter_test/flutter_test.dart'; void main() { testWidgets('Check that the children are layed out.', (WidgetTester tester) async { - await tester.pumpWidget( - const MaterialApp( - home: WrapExample(), - ), + const MaterialApp app = MaterialApp( + home: WrapExample(), ); + await tester.pumpWidget(app); await tester.pumpAndSettle(); // See if there are children layed out. @@ -23,10 +22,21 @@ void main() { expect(find.text('Index 3'), findsOneWidget); expect(find.text('Index 4'), findsOneWidget); + // Material 3 changes the expected layout positioning. + final bool usesMaterial3 = (app.theme ?? ThemeData.light()).useMaterial3; + final Offset offset0 = + usesMaterial3 ? const Offset(0.0, 91.0) : const Offset(0.0, 103.0); + final Offset offset1 = + usesMaterial3 ? const Offset(65.0, 121.0) : const Offset(66.0, 124.0); + final Offset offset3 = + usesMaterial3 ? const Offset(270.0, 171.0) : const Offset(271.0, 174.0); + final Offset offset4 = + usesMaterial3 ? const Offset(380.0, 221.0) : const Offset(381.0, 224.0); + // See if they are in expected position. - expect(tester.getTopLeft(find.text('Index 0')), const Offset(0.0, 103.0)); - expect(tester.getTopLeft(find.text('Index 1')), const Offset(66.0, 124.0)); - expect(tester.getTopLeft(find.text('Index 3')), const Offset(271.0, 174.0)); - expect(tester.getTopLeft(find.text('Index 4')), const Offset(381.0, 224.0)); + expect(tester.getTopLeft(find.text('Index 0')), offset0); + expect(tester.getTopLeft(find.text('Index 1')), offset1); + expect(tester.getTopLeft(find.text('Index 3')), offset3); + expect(tester.getTopLeft(find.text('Index 4')), offset4); }); } From 049be7cfe7f4ab6d69a6e713d81e81909cc15751 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 18 Jul 2023 15:15:05 -0400 Subject: [PATCH 3/3] Adjust for web --- .../example/test/wrap_example_test.dart | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/dynamic_layouts/example/test/wrap_example_test.dart b/packages/dynamic_layouts/example/test/wrap_example_test.dart index 8fb31b8d13d..c517a9e0936 100644 --- a/packages/dynamic_layouts/example/test/wrap_example_test.dart +++ b/packages/dynamic_layouts/example/test/wrap_example_test.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:example/wrap_layout_example.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -24,14 +25,18 @@ void main() { // Material 3 changes the expected layout positioning. final bool usesMaterial3 = (app.theme ?? ThemeData.light()).useMaterial3; - final Offset offset0 = - usesMaterial3 ? const Offset(0.0, 91.0) : const Offset(0.0, 103.0); - final Offset offset1 = - usesMaterial3 ? const Offset(65.0, 121.0) : const Offset(66.0, 124.0); - final Offset offset3 = - usesMaterial3 ? const Offset(270.0, 171.0) : const Offset(271.0, 174.0); - final Offset offset4 = - usesMaterial3 ? const Offset(380.0, 221.0) : const Offset(381.0, 224.0); + final Offset offset0 = usesMaterial3 + ? Offset(0.0, _getExpectedYOffset(91.0)) + : const Offset(0.0, 103.0); + final Offset offset1 = usesMaterial3 + ? Offset(65.0, _getExpectedYOffset(121.0)) + : const Offset(66.0, 124.0); + final Offset offset3 = usesMaterial3 + ? Offset(270.0, _getExpectedYOffset(171.0)) + : const Offset(271.0, 174.0); + final Offset offset4 = usesMaterial3 + ? Offset(380.0, _getExpectedYOffset(221.0)) + : const Offset(381.0, 224.0); // See if they are in expected position. expect(tester.getTopLeft(find.text('Index 0')), offset0); @@ -40,3 +45,7 @@ void main() { expect(tester.getTopLeft(find.text('Index 4')), offset4); }); } + +double _getExpectedYOffset(double nonWeb) { + return kIsWeb ? nonWeb - 0.5 : nonWeb; +}