tests updated for adaptive alert dialogs

Author: u7088495

lib/widgets/dialog.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';
-import 'package:flutter/cupertino.dart';
 
 Widget _dialogActionText(String text) {
   return Text(
@@ -16,9 +16,9 @@ Widget _dialogActionText(String text) {
   );
 }
 
-// Sets the dialog action to be platform appropriate
-// by displaying a [CupertinoDialogAction] for IOS platforms
-// and a regular [TextButton] otherwise.
+/// Sets the dialog action to be platform appropriate
+/// by displaying a [CupertinoDialogAction] for IOS platforms
+/// and a regular [TextButton] otherwise.
 Widget _adaptiveAction(
       {required BuildContext context,
       required VoidCallback onPressed,

pubspec.lock

@@ -315,10 +315,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   file_picker:
     dependency: "direct main"
     description:

test/widgets/dialog_checks.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -6,21 +8,41 @@ import 'package:flutter_test/flutter_test.dart';
 /// Checks for an error dialog matching an expected title
 /// and, optionally, matching an expected message. Fails if none is found.
 ///
-/// On success, returns the widget's "OK" button.
+/// On success, returns the widget's "OK" button
+/// (which is a [CupertinoDialogAction] for OS platforms).
+/// 
 /// Dismiss the dialog by calling `tester.tap(find.byWidget(okButton))`.
 Widget checkErrorDialog(WidgetTester tester, {
   required String expectedTitle,
   String? expectedMessage,
 }) {
-  final dialog = tester.widget<AlertDialog>(find.byType(AlertDialog));
-  tester.widget(find.descendant(matchRoot: true,
-    of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));
-  if (expectedMessage != null) {
+  if (defaultTargetPlatform == TargetPlatform.iOS 
+    || defaultTargetPlatform == TargetPlatform.macOS) {
+        
+    final dialog = tester.widget<CupertinoAlertDialog>(find.byType(CupertinoAlertDialog));
+
     tester.widget(find.descendant(matchRoot: true,
-      of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));
-  }
+    of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));
 
-  return tester.widget(
-    find.descendant(of: find.byWidget(dialog),
-      matching: find.widgetWithText(TextButton, 'OK')));
+    if (expectedMessage != null) {
+      tester.widget(find.descendant(matchRoot: true,
+        of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));
+    }
+
+    return tester.widget(
+      find.descendant(of: find.byWidget(dialog),
+        matching: find.widgetWithText(CupertinoDialogAction, 'OK')));
+
+  } 
+  else {
+    final dialog = tester.widget<Dialog>(find.byType(Dialog));
+    tester.widget(find.widgetWithText(Dialog, expectedTitle));
+    if (expectedMessage != null) {
+      tester.widget(find.widgetWithText(Dialog, expectedMessage));
+    }
+    return tester.widget(
+      find.descendant(of: find.byWidget(dialog),
+        matching: find.widgetWithText(TextButton, 'OK')));
+  }
+    
 }