Skip to content

null safety on sentry_flutter #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marandaneto merged 17 commits into from
Mar 7, 2021
Merged

null safety on sentry_flutter #337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
13eb5bf
migrate to null safety for sentry_flutter
fzyzcjy Mar 5, 2021
697f41c
make it compile on dart2.12/flutter2.0
fzyzcjy Mar 5, 2021
5cb2538
fix a few constructors
fzyzcjy Mar 6, 2021
07fcaee
avoid WidgetsBinding.instance! as it can be null
fzyzcjy Mar 6, 2021
b7b8e23
remove `as FutureOr Function()`
fzyzcjy Mar 6, 2021
5aeebd6
fix compile error
fzyzcjy Mar 6, 2021
8550c13
remove getter/setter which are only used for null checks
fzyzcjy Mar 6, 2021
9c3ccff
fixbug some warnings
fzyzcjy Mar 6, 2021
a443a43
generate mocks using mockito code generator
fzyzcjy Mar 6, 2021
68458a8
fix bugs about "!" on null value, and return null value
fzyzcjy Mar 6, 2021
20a9323
add a "when", otherwise mockito complains no stub value to return
fzyzcjy Mar 6, 2021
ad05773
make _observer nullable, since `call` may not be called
fzyzcjy Mar 6, 2021
10247d1
add changelog
fzyzcjy Mar 6, 2021
85b76b0
execute `flutter format .` on sentry-flutter
fzyzcjy Mar 6, 2021
fb2913a
fix analyze problems
fzyzcjy Mar 6, 2021
adb9c4a
change mockito version
fzyzcjy Mar 6, 2021
e3d8051
change signature of ensureInitialized
fzyzcjy Mar 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix bugs about "!" on null value, and return null value
  • Loading branch information
@fzyzcjy
fzyzcjy committed Mar 6, 2021
commit 68458a88a558f6dff3765bb3cba65da885df32e9
2 changes: 1 addition & 1 deletion flutter/test/sentry_flutter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void main() {
_channel.setMockMethodCallHandler(
(MethodCall methodCall) async => <String, dynamic>{},
);
when(transport.send(any!))
when(transport.send(any))
.thenAnswer((realInvocation) => Future.value(SentryId.newId()));
});

Expand Down
12 changes: 6 additions & 6 deletions flutter/test/sentry_navigator_observer_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void main() {

group('SentryNavigatorObserver', () {
PageRoute route(RouteSettings? settings) => PageRouteBuilder<void>(
pageBuilder: ((_, __, ___) => null) as Widget Function(BuildContext, Animation<double>, Animation<double>),
pageBuilder: (_, __, ___) => Container(),
settings: settings,
);

Expand All @@ -153,7 +153,7 @@ void main() {
observer.didPush(route(to), route(previous));

final dynamic breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;
expect(
breadcrumb.data,
RouteObserverBreadcrumb(
Expand All @@ -174,7 +174,7 @@ void main() {
observer.didPush(route(to), route(previous));

final dynamic breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;
expect(
breadcrumb.data,
RouteObserverBreadcrumb(
Expand All @@ -195,7 +195,7 @@ void main() {
observer.didReplace(newRoute: to, oldRoute: previous);

final dynamic breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;
expect(
breadcrumb.data,
RouteObserverBreadcrumb(
Expand All @@ -206,7 +206,7 @@ void main() {

test('No RouteSettings', () {
PageRoute route() => PageRouteBuilder<void>(
pageBuilder: ((_, __, ___) => null) as Widget Function(BuildContext, Animation<double>, Animation<double>),
pageBuilder: (_, __, ___) => Container(),
);

final hub = MockHub();
Expand All @@ -218,7 +218,7 @@ void main() {
observer.didPop(to, previous);

final dynamic breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;
expect(
breadcrumb.data,
RouteObserverBreadcrumb(
Expand Down
26 changes: 13 additions & 13 deletions flutter/test/widgets_binding_observer_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void main() {
.handlePlatformMessage('flutter/system', message, (_) {});

final breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;

expect(
breadcrumb.message,
Expand Down Expand Up @@ -70,7 +70,7 @@ void main() {
await WidgetsBinding.instance!.defaultBinaryMessenger
.handlePlatformMessage('flutter/system', message, (_) {});

verifyNever(hub.addBreadcrumb(captureAny!));
verifyNever(hub.addBreadcrumb(captureAny));

WidgetsBinding.instance!.removeObserver(observer);
});
Expand Down Expand Up @@ -100,7 +100,7 @@ void main() {
await sendLifecycle('paused');

var breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.last as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.last as Breadcrumb;
expect(breadcrumb.category, 'app.lifecycle');
expect(breadcrumb.type, 'navigation');
expect(breadcrumb.data, mapForLifecycle('paused'));
Expand All @@ -110,7 +110,7 @@ void main() {
await sendLifecycle('resumed');

breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.last as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.last as Breadcrumb;
expect(breadcrumb.category, 'app.lifecycle');
expect(breadcrumb.type, 'navigation');
expect(breadcrumb.data, mapForLifecycle('resumed'));
Expand All @@ -120,7 +120,7 @@ void main() {
await sendLifecycle('inactive');

breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.last as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.last as Breadcrumb;
expect(breadcrumb.category, 'app.lifecycle');
expect(breadcrumb.type, 'navigation');
expect(breadcrumb.data, mapForLifecycle('inactive'));
Expand All @@ -130,7 +130,7 @@ void main() {
await sendLifecycle('detached');

breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.last as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.last as Breadcrumb;
expect(breadcrumb.category, 'app.lifecycle');
expect(breadcrumb.type, 'navigation');
expect(breadcrumb.data, mapForLifecycle('detached'));
Expand Down Expand Up @@ -158,7 +158,7 @@ void main() {

await sendLifecycle('paused');

verifyNever(hub.addBreadcrumb(captureAny!));
verifyNever(hub.addBreadcrumb(captureAny));

WidgetsBinding.instance!.removeObserver(observer);
});
Expand All @@ -177,7 +177,7 @@ void main() {
window.onMetricsChanged!();

final breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;

expect(breadcrumb.message, 'Screen size changed');
expect(breadcrumb.category, 'device.screen');
Expand Down Expand Up @@ -206,7 +206,7 @@ void main() {

window.onMetricsChanged!();

verifyNever(hub.addBreadcrumb(captureAny!));
verifyNever(hub.addBreadcrumb(captureAny));

WidgetsBinding.instance!.removeObserver(observer);
});
Expand All @@ -229,7 +229,7 @@ void main() {
brightness == Brightness.dark ? 'dark' : 'light';

final breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;

expect(breadcrumb.message,
'Platform brightness was changed to $brightnessDescription.');
Expand Down Expand Up @@ -258,7 +258,7 @@ void main() {

window.onPlatformBrightnessChanged!();

verifyNever(hub.addBreadcrumb(captureAny!));
verifyNever(hub.addBreadcrumb(captureAny));

WidgetsBinding.instance!.removeObserver(observer);
});
Expand All @@ -280,7 +280,7 @@ void main() {
final newTextScaleFactor = WidgetsBinding.instance!.window.textScaleFactor;

final breadcrumb =
verify(hub.addBreadcrumb(captureAny!)).captured.single as Breadcrumb;
verify(hub.addBreadcrumb(captureAny)).captured.single as Breadcrumb;

expect(breadcrumb.message,
'Text scale factor changed to $newTextScaleFactor.');
Expand All @@ -306,7 +306,7 @@ void main() {

window.onTextScaleFactorChanged!();

verifyNever(hub.addBreadcrumb(captureAny!));
verifyNever(hub.addBreadcrumb(captureAny));

WidgetsBinding.instance!.removeObserver(observer);
});
Expand Down