dont use catch for test verification

getsentry · Jan 9, 2023 · 50bb8f1 · 50bb8f1
1 parent cc7cf83
commit 50bb8f1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/flutter/test/sentry_flutter_test.dart b/flutter/test/sentry_flutter_test.dart
@@ -76,7 +76,7 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: true);
+          options: sentryFlutterOptions!, expectedHasNativeScopeObserver: true);
 
       testConfiguration(
           integrations: integrations,
@@ -124,7 +124,7 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: true);
+          options: sentryFlutterOptions!, expectedHasNativeScopeObserver: true);
 
       testConfiguration(
         integrations: integrations,
@@ -170,7 +170,7 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: true);
+          options: sentryFlutterOptions!, expectedHasNativeScopeObserver: true);
 
       testConfiguration(
         integrations: integrations,
@@ -216,7 +216,8 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: false);
+          options: sentryFlutterOptions!,
+          expectedHasNativeScopeObserver: false);
 
       testConfiguration(
         integrations: integrations,
@@ -264,7 +265,8 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: false);
+          options: sentryFlutterOptions!,
+          expectedHasNativeScopeObserver: false);
 
       testConfiguration(
         integrations: integrations,
@@ -315,7 +317,8 @@ void main() {
       );
 
       testScopeObserver(
-          options: sentryFlutterOptions!, hasNativeScopeObserver: false);
+          options: sentryFlutterOptions!,
+          expectedHasNativeScopeObserver: false);
 
       testConfiguration(
         integrations: integrations,

diff --git a/flutter/test/sentry_flutter_util.dart b/flutter/test/sentry_flutter_util.dart
@@ -16,14 +16,15 @@ void testTransport({
 
 void testScopeObserver(
     {required SentryFlutterOptions options,
-    required bool hasNativeScopeObserver}) {
-  try {
-    options.scopeObservers
-        .firstWhere((element) => element.runtimeType == NativeScopeObserver);
-    expect(true, hasNativeScopeObserver);
-  } catch (_) {
-    expect(false, hasNativeScopeObserver);
+    required bool expectedHasNativeScopeObserver}) {
+  var actualHasNativeScopeObserver = false;
+  for (final scopeObserver in options.scopeObservers) {
+    if (scopeObserver.runtimeType == NativeScopeObserver) {
+      actualHasNativeScopeObserver = true;
+      break;
+    }
   }
+  expect(actualHasNativeScopeObserver, expectedHasNativeScopeObserver);
 }
 
 void testConfiguration({