π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Consolidate Auth window placement tests
Neeraj Gupta7fc5ad3ed20a
diff --git a/mobile/apps/auth/test/services/window_placement_test.dart b/mobile/apps/auth/test/services/window_placement_test.dartindex 5b3822bee4..4e8498dd79 100644--- a/mobile/apps/auth/test/services/window_placement_test.dart+++ b/mobile/apps/auth/test/services/window_placement_test.dart@@ -1,4 +1,3 @@-import 'dart:convert';import 'dart:ui';import 'package:ente_auth/services/window_placement.dart';@@ -7,35 +6,11 @@ import 'package:flutter_test/flutter_test.dart';void main() {const primary = Monitor('primary',- Rect.fromLTWH(0, 0, 1920, 1040),+ Rect.fromLTWH(48, 40, 700, 900),1,primary: true,);- const normal = Placement('primary', Rect.fromLTWH(180, 150, 500, 420), false);- test('normal bounds survive serialization and restart', () {- final decoded = Placement.fromJson(jsonDecode(jsonEncode(normal.toJson())));- expect(- restoreBounds(decoded, [primary], const Size(800, 1200)),- normal.logicalBounds,- );- });- for (final area in const [- Rect.fromLTWH(0, 48, 1920, 1032),- Rect.fromLTWH(0, 0, 1920, 1032),- Rect.fromLTWH(48, 0, 1872, 1080),- Rect.fromLTWH(0, 0, 1872, 1080),- ]) {- test('oversized defaults fit taskbar work area $area', () {- final restored = restoreBounds(null, [- Monitor('primary', area, 1, primary: true),- ], const Size(800, 1200));- expect(restored.top, greaterThanOrEqualTo(area.top));- expect(restored.bottom, lessThanOrEqualTo(area.bottom));- expect(restored.left, greaterThanOrEqualTo(area.left));- expect(restored.right, lessThanOrEqualTo(area.right));- });- }- test('secondary monitor with negative origin restores in its own scale', () {+ test('restores secondary monitor geometry after DPI and layout changes', () {const secondary = Monitor('second',Rect.fromLTWH(-2560, 60, 2560, 1380),@@ -47,32 +22,22 @@ void main() {restoreBounds(saved, [primary, secondary], const Size(800, 1200)),bounds,);+ const moved = Monitor('second', Rect.fromLTWH(1920, 80, 2560, 1360), 2);+ expect(+ restoreBounds(saved, [primary, moved], const Size(800, 1200)),+ const Rect.fromLTWH(2320, 280, 1000, 840),+ );});- test(- 'DPI and monitor-layout changes retain logical size and local offset',- () {- const moved = Monitor(- 'primary',- Rect.fromLTWH(1920, 80, 2560, 1360),- 2,- primary: true,- );+ test('missing geometry or monitor fits the primary work area', () {+ for (final saved in const [+ null,+ Placement('removed', Rect.fromLTWH(2000, 2000, 3000, 2000), false),+ ]) {expect(- restoreBounds(normal, [moved], const Size(800, 1200)),- const Rect.fromLTWH(2280, 380, 1000, 840),+ restoreBounds(saved, [primary], const Size(800, 1200)),+ primary.workArea,);- },- );- test('removed monitor falls back to primary and fits its work area', () {- const lost = Placement(- 'removed',- Rect.fromLTWH(2000, 2000, 3000, 2000),- false,- );- expect(- restoreBounds(lost, [primary], const Size(800, 1200)),- primary.workArea,- );+ }});test('invalid persisted geometry is rejected', () {for (final invalid in [double.nan, double.infinity, -1.0, 0.0]) {diff --git a/mobile/apps/auth/test/services/windows_window_placement_test.dart b/mobile/apps/auth/test/services/windows_window_placement_test.dartindex 83c99d0a4e..cac5083184 100644--- a/mobile/apps/auth/test/services/windows_window_placement_test.dart+++ b/mobile/apps/auth/test/services/windows_window_placement_test.dart@@ -13,6 +13,7 @@ void main() {const key = 'windowsWindowPlacement';const size = Size(500, 420);const normal = Rect.fromLTWH(180, 150, 500, 420);+ const moved = Rect.fromLTWH(300, 180, 460, 380);final messenger =TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger;late SharedPreferences preferences;@@ -67,74 +68,49 @@ void main() {jsonDecode(preferences.getString(key)!) as Map<String, dynamic>,);- test('restores the saved normal bounds and maximized state', () async {- await preferences.setString(- key,- jsonEncode(const Placement('primary', normal, true).toJson()),- );+ test('persists geometry and ignores startup saves', () async {+ await placement.startSaving();+ snapshot['normalBounds'] = rectJson(moved);+ snapshot['maximized'] = true;+ await placement.save();+ placement = WindowsWindowPlacement(preferences);+ snapshot['normalBounds'] = rectJson(normal);+ snapshot['maximized'] = false;+ await placement.save(maximized: false);expect(await placement.restore(size, false), isTrue);- expect(restored, normal);+ expect(restored, moved);+ await placement.save(maximized: false);+ expect(saved().maximized, isTrue);+ await placement.startSaving();+ expect(saved().maximized, isFalse);});- test(- 'first launch retains the legacy size and maximized preference',- () async {+ for (final stored in [null, '{broken']) {+ test('legacy defaults with stored placement: $stored', () async {+ if (stored != null) await preferences.setString(key, stored);expect(await placement.restore(size, true), isTrue);expect(restored, const Rect.fromLTWH(70, 70, 500, 420));- },- );-- test('invalid stored data uses the legacy defaults', () async {- await preferences.setString(key, '{broken');- expect(await placement.restore(size, false), isFalse);- expect(restored?.size, size);- });-- test('startup events cannot overwrite saved placement', () async {- await placement.save(maximized: true);- await placement.restore(size, false);- await placement.save();- expect(captures, 1);- expect(preferences.getString(key), isNull);- await placement.startSaving();- expect(saved().logicalBounds, normal);- });+ });+ }- test('maximized capture reads the current native normal rectangle', () async {+ test('queued saves retain placement through minimize', () async {await placement.startSaving();- const moved = Rect.fromLTWH(300, 180, 460, 380);snapshot['normalBounds'] = rectJson(moved);- snapshot['maximized'] = true;- await placement.save(maximized: true);+ blocked = Completer<void>();+ final maximize = placement.save(maximized: true);+ final flush = placement.save();+ await Future<void>.delayed(Duration.zero);+ expect(captures, 2);+ snapshot['minimized'] = true;+ blocked!.complete();+ await flush;+ expect(captures, 3);expect(saved().logicalBounds, moved);expect(saved().maximized, isTrue);- });-- test(- 'rapid maximize then minimize keeps the latest normal bounds and state',- () async {- await placement.startSaving();- const moved = Rect.fromLTWH(300, 180, 460, 380);- snapshot['normalBounds'] = rectJson(moved);- snapshot['minimized'] = true;- final maximize = placement.save(maximized: true);- final minimize = placement.save();- await Future.wait([maximize, minimize]);- expect(saved().logicalBounds, moved);- expect(saved().maximized, isTrue);- snapshot['minimized'] = false;- await placement.save(maximized: false);- expect(saved().maximized, isFalse);- },- );-- test('a failed capture does not block a later save', () async {- fail = true;- await placement.startSaving();- expect(preferences.getString(key), isNull);- fail = false;- await placement.save();- expect(saved().logicalBounds, normal);+ await maximize;+ snapshot['minimized'] = false;+ await placement.save(maximized: false);+ expect(saved().maximized, isFalse);});test('a failed capture retains state events before minimizing', () async {@@ -144,20 +120,7 @@ void main() {fail = false;snapshot['minimized'] = true;await placement.save();- expect(saved().maximized, isTrue);- });-- test('the final save waits for earlier captures and persistence', () async {- await placement.startSaving();- final initialCaptures = captures;- blocked = Completer<void>();- final first = placement.save();- final flush = placement.save();- await Future<void>.delayed(Duration.zero);- expect(captures, initialCaptures + 1);- blocked!.complete();- await Future.wait([first, flush]);- expect(captures, initialCaptures + 2);expect(saved().logicalBounds, normal);+ expect(saved().maximized, isTrue);});}