Skip to content

Commit cc161d4

Browse files
mbcoronaPiinks
authored andcommitted
Scope SemanticsTester per test in scrollable_semantics_test (flutter#189799)
1 parent 99a98f1 commit cc161d4

1 file changed

Lines changed: 20 additions & 22 deletions

File tree

‎packages/flutter/test/widgets/scrollable_semantics_test.dart‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ class _PinnedHeaderDelegate extends SliverPersistentHeaderDelegate {
3535
const double _kToolbarHeight = 56.0;
3636

3737
void main() {
38-
SemanticsTester semantics;
39-
4038
setUp(() {
4139
debugResetSemanticsIdCounter();
4240
});
4341

4442
testWidgets('scrollable exposes the correct semantic actions', (WidgetTester tester) async {
45-
semantics = SemanticsTester(tester);
43+
final semantics = SemanticsTester(tester);
4644
await tester.pumpWidget(
4745
Directionality(
4846
textDirection: TextDirection.ltr,
@@ -101,7 +99,7 @@ void main() {
10199
});
102100

103101
testWidgets('Vertical scrollable responds to scrollToOffset', (WidgetTester tester) async {
104-
semantics = SemanticsTester(tester);
102+
final semantics = SemanticsTester(tester);
105103
final controller = ScrollController();
106104
await tester.pumpWidget(
107105
Directionality(
@@ -132,7 +130,7 @@ void main() {
132130
});
133131

134132
testWidgets('Horizontal scrollable responds to scrollToOffset', (WidgetTester tester) async {
135-
semantics = SemanticsTester(tester);
133+
final semantics = SemanticsTester(tester);
136134
final controller = ScrollController();
137135
await tester.pumpWidget(
138136
Directionality(
@@ -166,7 +164,7 @@ void main() {
166164
testWidgets('Unscrollable scrollable does not respond to scrollToOffset', (
167165
WidgetTester tester,
168166
) async {
169-
semantics = SemanticsTester(tester);
167+
final semantics = SemanticsTester(tester);
170168
await tester.pumpWidget(
171169
Directionality(
172170
textDirection: TextDirection.ltr,
@@ -185,7 +183,7 @@ void main() {
185183
testWidgets('Scrollable exposes implicit scrolling before dimensions are available', (
186184
WidgetTester tester,
187185
) async {
188-
semantics = SemanticsTester(tester);
186+
final semantics = SemanticsTester(tester);
189187
final controller = _NoDimensionsDuringSemanticsScrollController();
190188
addTearDown(controller.dispose);
191189

@@ -212,7 +210,7 @@ void main() {
212210
testWidgets('scrollToOffset respects implicit scrolling configuration', (
213211
WidgetTester tester,
214212
) async {
215-
semantics = SemanticsTester(tester);
213+
final semantics = SemanticsTester(tester);
216214
final ScrollPhysics physics = _NoImplicitScrollingScrollPhysics();
217215
await tester.pumpWidget(
218216
Directionality(
@@ -233,7 +231,7 @@ void main() {
233231
});
234232

235233
testWidgets('showOnScreen works in scrollable', (WidgetTester tester) async {
236-
semantics = SemanticsTester(tester); // enables semantics tree generation
234+
final semantics = SemanticsTester(tester); // enables semantics tree generation
237235

238236
const kItemHeight = 40.0;
239237

@@ -280,7 +278,7 @@ void main() {
280278
testWidgets('showOnScreen works with pinned app bar and sliver list', (
281279
WidgetTester tester,
282280
) async {
283-
semantics = SemanticsTester(tester); // enables semantics tree generation
281+
final semantics = SemanticsTester(tester); // enables semantics tree generation
284282

285283
const kItemHeight = 100.0;
286284
const kExpandedAppBarHeight = 56.0;
@@ -343,7 +341,7 @@ void main() {
343341
testWidgets('showOnScreen works with pinned app bar and individual slivers', (
344342
WidgetTester tester,
345343
) async {
346-
semantics = SemanticsTester(tester); // enables semantics tree generation
344+
final semantics = SemanticsTester(tester); // enables semantics tree generation
347345

348346
const kItemHeight = 100.0;
349347
const kExpandedAppBarHeight = 256.0;
@@ -401,7 +399,7 @@ void main() {
401399
});
402400

403401
testWidgets('correct scrollProgress', (WidgetTester tester) async {
404-
semantics = SemanticsTester(tester);
402+
final semantics = SemanticsTester(tester);
405403

406404
await tester.pumpWidget(
407405
Directionality(
@@ -452,7 +450,7 @@ void main() {
452450
});
453451

454452
testWidgets('correct scrollProgress for unbound', (WidgetTester tester) async {
455-
semantics = SemanticsTester(tester);
453+
final semantics = SemanticsTester(tester);
456454

457455
await tester.pumpWidget(
458456
Directionality(
@@ -513,7 +511,7 @@ void main() {
513511
});
514512

515513
testWidgets('Semantics tree is populated mid-scroll', (WidgetTester tester) async {
516-
semantics = SemanticsTester(tester);
514+
final semantics = SemanticsTester(tester);
517515

518516
final children = List<Widget>.generate(
519517
80,
@@ -571,7 +569,7 @@ void main() {
571569
expect(tester.binding.pipelineOwner.semanticsOwner, isNull);
572570

573571
// Semantics on
574-
semantics = SemanticsTester(tester);
572+
var semantics = SemanticsTester(tester);
575573
await tester.pumpAndSettle();
576574
expect(tester.binding.pipelineOwner.semanticsOwner, isNotNull);
577575
expect(
@@ -624,7 +622,7 @@ void main() {
624622
});
625623

626624
testWidgets('brings item above leading edge to leading edge', (WidgetTester tester) async {
627-
semantics = SemanticsTester(tester); // enables semantics tree generation
625+
final semantics = SemanticsTester(tester); // enables semantics tree generation
628626

629627
await tester.pumpWidget(widgetUnderTest);
630628

@@ -646,7 +644,7 @@ void main() {
646644
});
647645

648646
testWidgets('brings item below trailing edge to trailing edge', (WidgetTester tester) async {
649-
semantics = SemanticsTester(tester); // enables semantics tree generation
647+
final semantics = SemanticsTester(tester); // enables semantics tree generation
650648

651649
await tester.pumpWidget(widgetUnderTest);
652650

@@ -670,7 +668,7 @@ void main() {
670668
testWidgets('does not change position of items already fully on-screen', (
671669
WidgetTester tester,
672670
) async {
673-
semantics = SemanticsTester(tester); // enables semantics tree generation
671+
final semantics = SemanticsTester(tester); // enables semantics tree generation
674672

675673
await tester.pumpWidget(widgetUnderTest);
676674

@@ -747,7 +745,7 @@ void main() {
747745
});
748746

749747
testWidgets('brings item above leading edge to leading edge', (WidgetTester tester) async {
750-
semantics = SemanticsTester(tester); // enables semantics tree generation
748+
final semantics = SemanticsTester(tester); // enables semantics tree generation
751749

752750
await tester.pumpWidget(widgetUnderTest);
753751

@@ -769,7 +767,7 @@ void main() {
769767
});
770768

771769
testWidgets('brings item below trailing edge to trailing edge', (WidgetTester tester) async {
772-
semantics = SemanticsTester(tester); // enables semantics tree generation
770+
final semantics = SemanticsTester(tester); // enables semantics tree generation
773771

774772
await tester.pumpWidget(widgetUnderTest);
775773

@@ -793,7 +791,7 @@ void main() {
793791
testWidgets('does not change position of items already fully on-screen', (
794792
WidgetTester tester,
795793
) async {
796-
semantics = SemanticsTester(tester); // enables semantics tree generation
794+
final semantics = SemanticsTester(tester); // enables semantics tree generation
797795

798796
await tester.pumpWidget(widgetUnderTest);
799797

@@ -818,7 +816,7 @@ void main() {
818816
testWidgets(
819817
'transform of inner node from useTwoPaneSemantics scrolls correctly with nested scrollables',
820818
(WidgetTester tester) async {
821-
semantics = SemanticsTester(tester); // enables semantics tree generation
819+
final semantics = SemanticsTester(tester); // enables semantics tree generation
822820

823821
// Context: https://github.com/flutter/flutter/issues/61631
824822
await tester.pumpWidget(

0 commit comments

Comments
 (0)