Skip to content

Commit bb73121

Browse files
authored
Remove unnecessary null checks in flutter/test (#118905)
1 parent 288a773 commit bb73121

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+48
-133
lines changed

packages/flutter/test/cupertino/route_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,6 @@ void main() {
18301830
child: const Text('Home'),
18311831
onPressed: () {
18321832
navigator = Navigator.of(context);
1833-
assert(navigator != null);
18341833
navigator.push<void>(r);
18351834
},
18361835
);

packages/flutter/test/gestures/locking_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class TestGestureFlutterBinding extends BindingBase with GestureBinding {
2929
);
3030

3131
Future<void> test(VoidCallback callback) {
32-
assert(callback != null);
3332
return _binding.lockEvents(() async {
3433
GestureBinding.instance.platformDispatcher.onPointerDataPacket?.call(packet);
3534
callback();
@@ -41,7 +40,6 @@ late TestGestureFlutterBinding _binding;
4140

4241
void main() {
4342
_binding = TestGestureFlutterBinding();
44-
assert(GestureBinding.instance != null);
4543

4644
test('Pointer events are locked during reassemble', () async {
4745
final List<PointerEvent> events = <PointerEvent>[];

packages/flutter/test/gestures/velocity_tracker_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ bool _withinTolerance(double actual, double expected) {
1313
}
1414

1515
bool _checkVelocity(Velocity actual, Offset expected) {
16-
return (actual != null)
17-
&& _withinTolerance(actual.pixelsPerSecond.dx, expected.dx)
16+
return _withinTolerance(actual.pixelsPerSecond.dx, expected.dx)
1817
&& _withinTolerance(actual.pixelsPerSecond.dy, expected.dy);
1918
}
2019

packages/flutter/test/material/bottom_navigation_bar_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,6 @@ void main() {
24912491
}
24922492

24932493
Widget boilerplate({ Widget? bottomNavigationBar, required TextDirection textDirection }) {
2494-
assert(textDirection != null);
24952494
return MaterialApp(
24962495
home: Localizations(
24972496
locale: const Locale('en', 'US'),

packages/flutter/test/material/chip_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ void main() {
15061506
StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
15071507
return RawChip(
15081508
avatar: avatar,
1509-
onSelected: selectable != null
1509+
onSelected: selectable
15101510
? (bool value) {
15111511
setState(() {
15121512
selected = value;
@@ -1585,7 +1585,7 @@ void main() {
15851585
children: <Widget>[
15861586
StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
15871587
return RawChip(
1588-
onSelected: selectable != null
1588+
onSelected: selectable
15891589
? (bool value) {
15901590
setState(() {
15911591
selected = value;
@@ -1659,7 +1659,7 @@ void main() {
16591659
StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
16601660
return RawChip(
16611661
avatar: avatar,
1662-
onSelected: selectable != null
1662+
onSelected: selectable
16631663
? (bool value) {
16641664
setState(() {
16651665
selected = value;

packages/flutter/test/material/dropdown_test.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,6 @@ void main() {
717717
expect(itemBoxes.length, equals(2));
718718
for (final RenderBox itemBox in itemBoxes) {
719719
assert(itemBox.attached);
720-
assert(textDirection != null);
721720
switch (textDirection) {
722721
case TextDirection.rtl:
723722
expect(
@@ -1145,13 +1144,11 @@ void main() {
11451144
tester.element(find.byType(ListView)).visitAncestorElements((Element element) {
11461145
if (element.toString().startsWith('_DropdownMenu')) {
11471146
final RenderBox box = element.findRenderObject()! as RenderBox;
1148-
assert(box != null);
11491147
menuRect = box.localToGlobal(Offset.zero) & box.size;
11501148
return false;
11511149
}
11521150
return true;
11531151
});
1154-
assert(menuRect != null);
11551152
return menuRect;
11561153
}
11571154

@@ -1859,9 +1856,7 @@ void main() {
18591856
double getMenuScroll() {
18601857
double scrollPosition;
18611858
final ScrollController scrollController = PrimaryScrollController.of(tester.element(find.byType(ListView)));
1862-
assert(scrollController != null);
18631859
scrollPosition = scrollController.position.pixels;
1864-
assert(scrollPosition != null);
18651860
return scrollPosition;
18661861
}
18671862

@@ -1895,9 +1890,7 @@ void main() {
18951890
double getMenuScroll() {
18961891
double scrollPosition;
18971892
final ScrollController scrollController = PrimaryScrollController.of(tester.element(find.byType(ListView)));
1898-
assert(scrollController != null);
18991893
scrollPosition = scrollController.position.pixels;
1900-
assert(scrollPosition != null);
19011894
return scrollPosition;
19021895
}
19031896

@@ -1932,9 +1925,7 @@ void main() {
19321925
double getMenuScroll() {
19331926
double scrollPosition;
19341927
final ScrollController scrollController = PrimaryScrollController.of(tester.element(find.byType(ListView)));
1935-
assert(scrollController != null);
19361928
scrollPosition = scrollController.position.pixels;
1937-
assert(scrollPosition != null);
19381929
return scrollPosition;
19391930
}
19401931

@@ -1969,9 +1960,7 @@ void main() {
19691960
double getMenuScroll() {
19701961
double scrollPosition;
19711962
final ScrollController scrollController = PrimaryScrollController.of(tester.element(find.byType(ListView)));
1972-
assert(scrollController != null);
19731963
scrollPosition = scrollController.position.pixels;
1974-
assert(scrollPosition != null);
19751964
return scrollPosition;
19761965
}
19771966

packages/flutter/test/material/floating_action_button_location_test.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ void main() {
132132
);
133133
final Iterable<double> currentRotations = rotationTransitions.map((RotationTransition t) => t.turns.value);
134134

135-
if (previousRotations != null && previousRotations!.isNotEmpty
136-
&& currentRotations != null && currentRotations.isNotEmpty
135+
if (previousRotations != null && previousRotations!.isNotEmpty && currentRotations.isNotEmpty
137136
&& previousRect != null && currentRect != null) {
138137
final List<double> deltas = <double>[];
139138
for (final double currentRotation in currentRotations) {
@@ -1739,7 +1738,6 @@ class _StartTopFloatingActionButtonLocation extends FloatingActionButtonLocation
17391738
@override
17401739
Offset getOffset(ScaffoldPrelayoutGeometry scaffoldGeometry) {
17411740
double fabX;
1742-
assert(scaffoldGeometry.textDirection != null);
17431741
switch (scaffoldGeometry.textDirection) {
17441742
case TextDirection.rtl:
17451743
final double startPadding = kFloatingActionButtonMargin + scaffoldGeometry.minInsets.right;

packages/flutter/test/material/scaffold_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2774,7 +2774,7 @@ class _CustomPageRoute<T> extends PageRoute<T> {
27742774
RouteSettings super.settings = const RouteSettings(),
27752775
this.maintainState = true,
27762776
super.fullscreenDialog,
2777-
}) : assert(builder != null);
2777+
});
27782778

27792779
final WidgetBuilder builder;
27802780

packages/flutter/test/material/tooltip_test.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,9 +1340,7 @@ void main() {
13401340
const Duration waitDuration = Duration(seconds: 1);
13411341
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
13421342
addTearDown(() async {
1343-
if (gesture != null) {
1344-
return gesture.removePointer();
1345-
}
1343+
return gesture.removePointer();
13461344
});
13471345
await gesture.addPointer();
13481346
await gesture.moveTo(const Offset(1.0, 1.0));

packages/flutter/test/material/tooltip_visibility_test.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ void main() {
1414
testWidgets('Tooltip does not build MouseRegion when mouse is detected and in TooltipVisibility with visibility = false', (WidgetTester tester) async {
1515
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
1616
addTearDown(() async {
17-
if (gesture != null) {
18-
return gesture.removePointer();
19-
}
17+
return gesture.removePointer();
2018
});
2119
await gesture.addPointer();
2220
await gesture.moveTo(const Offset(1.0, 1.0));
@@ -45,9 +43,7 @@ void main() {
4543
const Duration waitDuration = Duration.zero;
4644
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
4745
addTearDown(() async {
48-
if (gesture != null) {
49-
return gesture.removePointer();
50-
}
46+
return gesture.removePointer();
5147
});
5248
await gesture.addPointer();
5349
await gesture.moveTo(const Offset(1.0, 1.0));

0 commit comments

Comments
 (0)