Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bb73121

Browse files
goderbauergoderbauer
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));

‎packages/flutter/test/painting/decoration_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ void main() {
240240
test('BoxDecoration backgroundImage clip', () async {
241241
final ui.Image image = await createTestImage(width: 100, height: 100);
242242
void testDecoration({ BoxShape shape = BoxShape.rectangle, BorderRadius? borderRadius, required bool expectClip }) {
243-
assert(shape != null);
244243
FakeAsync().run((FakeAsync async) async {
245244
final DelayedImageProvider imageProvider = DelayedImageProvider(image);
246245
final DecorationImage backgroundImage = DecorationImage(image: imageProvider);

‎packages/flutter/test/painting/mocks_for_image_cache.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class TestImageInfo extends ImageInfo {
4242
}
4343

4444
class TestImageProvider extends ImageProvider<int> {
45-
const TestImageProvider(this.key, this.imageValue, { required this.image })
46-
: assert(image != null);
45+
const TestImageProvider(this.key, this.imageValue, { required this.image });
4746

4847
final int key;
4948
final int imageValue;

‎packages/flutter/test/rendering/mock_canvas.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ class _PathMatcher extends Matcher {
498498
}
499499

500500
class _MismatchedCall {
501-
const _MismatchedCall(this.message, this.callIntroduction, this.call) : assert(call != null);
501+
const _MismatchedCall(this.message, this.callIntroduction, this.call);
502502
final String message;
503503
final String callIntroduction;
504504
final RecordedInvocation call;

‎packages/flutter/test/rendering/mouse_tracker_cursor_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,7 @@ ui.PointerData _pointerData(
448448
}
449449

450450
class _CursorUpdateDetails extends MethodCall {
451-
const _CursorUpdateDetails(super.method, Map<String, dynamic> super.arguments)
452-
: assert(arguments != null);
451+
const _CursorUpdateDetails(super.method, Map<String, dynamic> super.arguments);
453452

454453
_CursorUpdateDetails.wrap(MethodCall call)
455454
: super(call.method, Map<String, dynamic>.from(call.arguments as Map<dynamic, dynamic>));

‎packages/flutter/test/rendering/mouse_tracker_test.dart

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,13 @@ void main() {
4343
}) {
4444
final TestAnnotationTarget oneAnnotation = TestAnnotationTarget(
4545
onEnter: (PointerEnterEvent event) {
46-
if (logEvents != null) {
47-
logEvents.add(event);
48-
}
46+
logEvents.add(event);
4947
},
5048
onHover: (PointerHoverEvent event) {
51-
if (logEvents != null) {
52-
logEvents.add(event);
53-
}
49+
logEvents.add(event);
5450
},
5551
onExit: (PointerExitEvent event) {
56-
if (logEvents != null) {
57-
logEvents.add(event);
58-
}
52+
logEvents.add(event);
5953
},
6054
);
6155
setUpMouseAnnotationFinder(
@@ -608,8 +602,7 @@ ui.PointerData _pointerData(
608602
}
609603

610604
class BaseEventMatcher extends Matcher {
611-
BaseEventMatcher(this.expected)
612-
: assert(expected != null);
605+
BaseEventMatcher(this.expected);
613606

614607
final PointerEvent expected;
615608

‎packages/flutter/test/rendering/recording_canvas.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class RecordedInvocation {
2828

2929
/// Converts [stack] to a string using the [FlutterError.defaultStackFilter] logic.
3030
String stackToString({ String indent = '' }) {
31-
assert(indent != null);
3231
return indent + FlutterError.defaultStackFilter(
3332
stack.toString().trimRight().split('\n'),
3433
).join('\n$indent');
@@ -124,7 +123,6 @@ class TestRecordingPaintingContext extends ClipContext implements PaintingContex
124123
Clip clipBehavior = Clip.antiAlias,
125124
ClipRRectLayer? oldLayer,
126125
}) {
127-
assert(clipBehavior != null);
128126
clipRRectAndPaint(clipRRect.shift(offset), clipBehavior, bounds.shift(offset), () => painter(this, offset));
129127
return null;
130128
}

‎packages/flutter/test/rendering/rendering_tester.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,12 @@ class TestRenderingFlutterBinding extends BindingBase with SchedulerBinding, Ser
197197
///
198198
/// If `onErrors` is not null, it is set as [TestRenderingFlutterBinding.onError].
199199
void layout(
200-
RenderBox box, {
200+
RenderBox box, { // If you want to just repump the last box, call pumpFrame().
201201
BoxConstraints? constraints,
202202
Alignment alignment = Alignment.center,
203203
EnginePhase phase = EnginePhase.layout,
204204
VoidCallback? onErrors,
205205
}) {
206-
assert(box != null); // If you want to just repump the last box, call pumpFrame().
207206
assert(box.parent == null); // We stick the box in another, so you can't reuse it easily, sorry.
208207

209208
TestRenderingFlutterBinding.instance.renderView.child = null;
@@ -225,8 +224,6 @@ void layout(
225224
///
226225
/// If `onErrors` is not null, it is set as [TestRenderingFlutterBinding.onError].
227226
void pumpFrame({ EnginePhase phase = EnginePhase.layout, VoidCallback? onErrors }) {
228-
assert(TestRenderingFlutterBinding.instance != null);
229-
assert(TestRenderingFlutterBinding.instance.renderView != null);
230227
assert(TestRenderingFlutterBinding.instance.renderView.child != null); // call layout() first!
231228

232229
if (onErrors != null) {

‎packages/flutter/test/services/text_input_utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
88
import 'package:flutter_test/flutter_test.dart';
99

1010
class FakeTextChannel implements MethodChannel {
11-
FakeTextChannel(this.outgoing) : assert(outgoing != null);
11+
FakeTextChannel(this.outgoing);
1212

1313
Future<dynamic> Function(MethodCall) outgoing;
1414
Future<void> Function(MethodCall)? incoming;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,8 +1869,7 @@ class ThirdTestIntent extends SecondTestIntent {
18691869
class TestAction extends CallbackAction<TestIntent> {
18701870
TestAction({
18711871
required OnInvokeCallback onInvoke,
1872-
}) : assert(onInvoke != null),
1873-
super(onInvoke: onInvoke);
1872+
}) : super(onInvoke: onInvoke);
18741873

18751874
@override
18761875
bool isEnabled(TestIntent intent) => enabled;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ void main() {
507507
home: Scaffold(
508508
body: RawAutocomplete<String>(
509509
optionsBuilder: (TextEditingValue textEditingValue) {
510-
if (textEditingValue.text == null || textEditingValue.text == '') {
510+
if (textEditingValue.text == '') {
511511
return const Iterable<String>.empty();
512512
}
513513
return kOptions.where((String option) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@ class RenderBaselineDetector extends RenderBox {
151151

152152
@override
153153
double computeDistanceToActualBaseline(TextBaseline baseline) {
154-
if (callback != null) {
155-
callback();
156-
}
154+
callback();
157155
return 20.0;
158156
}
159157

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class LayoutWithMissingId extends ParentDataWidget<MultiChildLayoutParentData> {
153153
const LayoutWithMissingId({
154154
super.key,
155155
required super.child,
156-
}) : assert(child != null);
156+
});
157157

158158
@override
159159
void applyParentData(RenderObject renderObject) {}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ Future<void> dismissItem(
174174
required AxisDirection gestureDirection,
175175
DismissMethod mechanism = dismissElement,
176176
}) async {
177-
assert(gestureDirection != null);
178177
final Finder itemFinder = find.text(item.toString());
179178
expect(itemFinder, findsOneWidget);
180179

@@ -188,7 +187,6 @@ Future<void> dragItem(
188187
required AxisDirection gestureDirection,
189188
required double amount,
190189
}) async {
191-
assert(gestureDirection != null);
192190
final Finder itemFinder = find.text(item.toString());
193191
expect(itemFinder, findsOneWidget);
194192

@@ -202,7 +200,6 @@ Future<void> checkFlingItemBeforeMovementEnd(
202200
required AxisDirection gestureDirection,
203201
DismissMethod mechanism = rollbackElement,
204202
}) async {
205-
assert(gestureDirection != null);
206203
final Finder itemFinder = find.text(item.toString());
207204
expect(itemFinder, findsOneWidget);
208205

@@ -218,7 +215,6 @@ Future<void> checkFlingItemAfterMovement(
218215
required AxisDirection gestureDirection,
219216
DismissMethod mechanism = rollbackElement,
220217
}) async {
221-
assert(gestureDirection != null);
222218
final Finder itemFinder = find.text(item.toString());
223219
expect(itemFinder, findsOneWidget);
224220

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import '../painting/image_test_utils.dart';
1515
const Duration animationDuration = Duration(milliseconds: 50);
1616

1717
class FadeInImageParts {
18-
const FadeInImageParts(this.fadeInImageElement, this.placeholder, this.target)
19-
: assert(fadeInImageElement != null),
20-
assert(target != null);
18+
const FadeInImageParts(this.fadeInImageElement, this.placeholder, this.target);
2119

2220
final ComponentElement fadeInImageElement;
2321
final FadeInImageElements? placeholder;

0 commit comments

Comments
 (0)