Merge pull request #1465 from navidR/dev/navidr/fix-proof-layout-tests

Make Spark proof layout tests platform-independent

Author: julian-CStack

lib/utilities/util.dart

@@ -16,6 +16,7 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/number_symbols.dart';
 import 'package:intl/number_symbols_data.dart';
+import 'package:platform/platform.dart' as platform;
 
 import '../app_config.dart';
 import '../wallets/wallet/impl/monero_wallet.dart';
@@ -30,6 +31,7 @@ abstract class Util {
 
   static final Map<String, NumberSymbols?> _numberSymbolsCache = {};
 
+  static platform.Platform layoutPlatform = const platform.LocalPlatform();
   static double? screenWidth;
   static bool? isIpad;
 
@@ -84,16 +86,17 @@ abstract class Util {
   }
 
   static bool get isDesktop {
+    final p = layoutPlatform;
     // special check for running on linux based phones
-    if (Platform.isLinux && screenWidth != null && screenWidth! < 800) {
+    if (p.isLinux && screenWidth != null && screenWidth! < 800) {
       return false;
     }
 
     if (isIpad == true) {
       return true;
     }
 
-    return Platform.isLinux || Platform.isMacOS || Platform.isWindows;
+    return p.isLinux || p.isMacOS || p.isWindows;
   }
 
   static Future<bool> get getIsIPad async {

pubspec.lock

@@ -1903,7 +1903,7 @@ packages:
     source: hosted
     version: "0.6.0"
   platform:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: platform
       sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"

scripts/app_config/templates/pubspec.template.yaml

@@ -21,6 +21,7 @@ dependencies:
   flutter:
     sdk: flutter
   ffi: ^2.0.1
+  platform: ^3.1.6
   mutex: ^3.0.0
   web_socket_channel: ^2.4.0
 

test/pages/spark_address_ownership_proof_test.dart

@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
+import 'package:platform/platform.dart' as platform;
 import 'package:stackwallet/db/drift/database.dart';
 import 'package:stackwallet/db/isar/main_db.dart';
 import 'package:stackwallet/models/isar/models/isar_models.dart';
@@ -63,6 +64,20 @@ class _LabelDB extends Mock implements MainDB {
 }
 
 void main() {
+  setUp(() {
+    final previousPlatform = Util.layoutPlatform;
+    final previousWidth = Util.screenWidth;
+    final previousIsIpad = Util.isIpad;
+    addTearDown(() {
+      Util.layoutPlatform = previousPlatform;
+      Util.screenWidth = previousWidth;
+      Util.isIpad = previousIsIpad;
+    });
+    Util.layoutPlatform = platform.FakePlatform(operatingSystem: 'android');
+    Util.screenWidth = null;
+    Util.isIpad = false;
+  });
+
   setUpAll(() async {
     final directory = await Directory.systemTemp.createTemp('spark-proof-ui-');
     StackFileSystem.setDesktopOverrideDir(directory.path);
@@ -81,9 +96,10 @@ void main() {
     testWidgets(
       '${desktop ? "desktop" : "mobile"} proof layout and exact message',
       (tester) async {
-        final oldWidth = Util.screenWidth;
+        Util.layoutPlatform = platform.FakePlatform(
+          operatingSystem: desktop ? 'macos' : 'android',
+        );
         Util.screenWidth = desktop ? 1000 : 390;
-        addTearDown(() => Util.screenWidth = oldWidth);
         await tester.binding.setSurfaceSize(
           Size(desktop ? 1000 : 390, desktop ? 600 : 844),
         );
@@ -186,14 +202,9 @@ void main() {
     testWidgets('ownership action layout on ${ipad ? "iPad" : "small phone"}', (
       tester,
     ) async {
-      final oldWidth = Util.screenWidth;
-      final oldIpad = Util.isIpad;
+      Util.layoutPlatform = platform.FakePlatform(operatingSystem: 'ios');
       Util.screenWidth = ipad ? 1024 : 320;
       Util.isIpad = ipad;
-      addTearDown(() {
-        Util.screenWidth = oldWidth;
-        Util.isIpad = oldIpad;
-      });
       final size = Size(ipad ? 1024 : 320, ipad ? 768 : 568);
       await tester.binding.setSurfaceSize(size);
       addTearDown(() => tester.binding.setSurfaceSize(null));

test/utilities/util_layout_test.dart

@@ -0,0 +1,38 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/utilities/util.dart';
+
+void main() {
+  setUp(() {
+    final previousPlatform = Util.layoutPlatform;
+    final previousWidth = Util.screenWidth;
+    final previousIsIpad = Util.isIpad;
+    addTearDown(() {
+      Util.layoutPlatform = previousPlatform;
+      Util.screenWidth = previousWidth;
+      Util.isIpad = previousIsIpad;
+    });
+  });
+
+  for (final (os, width, ipad, desktop) in <(String, double?, bool, bool)>[
+    ('android', 390, false, false),
+    ('android', 1000, false, false),
+    ('ios', 390, false, false),
+    ('ios', 1024, false, false),
+    ('ios', 390, true, true),
+    ('ios', 1024, true, true),
+    ('macos', 390, false, true),
+    ('windows', 390, false, true),
+    ('linux', 799, false, false),
+    ('linux', 800, false, true),
+    ('linux', null, false, true),
+  ]) {
+    test('layout for $os at width $width with isIpad=$ipad', () {
+      Util.layoutPlatform = platform.FakePlatform(operatingSystem: os);
+      Util.screenWidth = width;
+      Util.isIpad = ipad;
+
+      expect(Util.isDesktop, desktop);
+    });
+  }
+}