π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
test(photos): trim image zoom tests further
ashil-pilot0e0ced65f064
diff --git a/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dartindex 5c543bd85f..68de693cbc 100644--- a/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom_geometry_test.dart@@ -4,22 +4,6 @@ import "package:photos/ui/viewer/file/image_zoom_geometry.dart";void main() {group("ImageZoomGeometry", () {- test("calculates contain, cover, original, and maximum scales", () {- final geometry = _geometry(- viewportSize: const Size(400, 300),- imageSize: const Size(1000, 500),- maxScaleOverCover: 2,- );-- expect(geometry.fittedImageSize, const Size(400, 200));- expect(geometry.fittedImageRect, const Rect.fromLTWH(0, 50, 400, 200));- expect(geometry.viewportCenter, const Offset(200, 150));- expect(geometry.initialScale, 1);- expect(geometry.coverScale, 1.5);- expect(geometry.originalScale, 2.5);- expect(geometry.maxScale, 3);- });-test("builds a bounded focal target around the tapped scene point", () {final geometry = _geometry(viewportSize: const Size(400, 400),@@ -58,22 +42,6 @@ void main() {expect(geometry.clampScale(0.5), 1);expect(geometry.clampScale(8), 3);});-- test("describes an initial cover transform as semantic identity", () {- final geometry = _geometry(- viewportSize: const Size(400, 300),- imageSize: const Size(1000, 500),- initialFit: BoxFit.cover,- );- final state = geometry.describe(- geometry.matrixForScaleAndOffset(geometry.initialScale, Offset.zero),- );-- expect(state.absoluteScale, 1.5);- expect(state.relativeScale, 1);- expect(state.semanticOffset, Offset.zero);- expect(state.isInitial, isTrue);- });});group("ImageZoomRebase", () {diff --git a/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dartindex 4e33aeede7..c373d4e4af 100644--- a/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom_stage_policy_test.dart@@ -2,37 +2,6 @@ import "package:flutter_test/flutter_test.dart";import "package:photos/ui/viewer/file/image_zoom_stage_policy.dart";void main() {- const standardPolicy = ImageZoomStagePolicy(- initialScale: 1,- coverScale: 1.5,- originalScale: 3,- maxScale: 6,- );-- test("normal double-tap cycle advances through every distinct stage", () {- expect(- standardPolicy.nextDoubleTapStage(- currentStage: ImageZoomStage.initial,- currentScale: 1,- ),- ImageZoomStage.covering,- );- expect(- standardPolicy.nextDoubleTapStage(- currentStage: ImageZoomStage.covering,- currentScale: 1.5,- ),- ImageZoomStage.originalSize,- );- expect(- standardPolicy.nextDoubleTapStage(- currentStage: ImageZoomStage.originalSize,- currentScale: 3,- ),- ImageZoomStage.initial,- );- });-test("duplicate or clamped stages are skipped", () {const duplicateCover = ImageZoomStagePolicy(initialScale: 1,@@ -90,21 +59,4 @@ void main() {isNull,);});-- test("gesture stage always resets to initial", () {- expect(- standardPolicy.nextDoubleTapStage(- currentStage: ImageZoomStage.gesture,- currentScale: 2.25,- ),- ImageZoomStage.initial,- );- expect(- standardPolicy.nextDoubleTapStage(- currentStage: ImageZoomStage.gesture,- currentScale: 1,- ),- ImageZoomStage.initial,- );- });}diff --git a/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart b/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dartindex 644574ccab..db0084ef11 100644--- a/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart+++ b/mobile/apps/photos/test/ui/viewer/file/zoom_to_tapped_point_test.dart@@ -56,18 +56,6 @@ void main() {expect(harness.controller.stage, ImageZoomStage.covering);});- testWidgets("clamps a focal point near the image edge", (tester) async {- final harness = await _pumpViewer(tester, image: landscapeImage);-- await _doubleTap(tester, harness.globalPoint(const Offset(390, 200)));-- _expectTransform(- harness.controller,- scale: 1.5,- offset: const Offset(-100, 0),- );- });-testWidgets("cycles through cover, original size, and initial", (tester,) async {@@ -228,41 +216,6 @@ void main() {expect(harness.controller.transform, ImageZoomTransform.identity);expect(harness.controller.stage, ImageZoomStage.initial);});-- testWidgets("a pinch interrupts a double-tap animation cleanly", (- tester,- ) async {- final harness = await _pumpViewer(tester, image: landscapeImage);- final center = harness.globalPoint(const Offset(200, 200));- await _beginDoubleTap(tester, center);- await tester.pump(const Duration(milliseconds: 60));- final interruptedScale = harness.controller.transform.scale;- expect(interruptedScale, inExclusiveRange(1, 1.5));-- final firstFinger = await tester.createGesture(pointer: 41);- final secondFinger = await tester.createGesture(pointer: 42);- await firstFinger.down(center - const Offset(30, 0));- await secondFinger.down(center + const Offset(30, 0));- await tester.pump();- await firstFinger.moveTo(center - const Offset(70, 0));- await secondFinger.moveTo(center + const Offset(70, 0));- await tester.pump();- await firstFinger.up();- await secondFinger.up();- await tester.pump();-- final pinchResult = harness.controller.transform;- expect(pinchResult.scale, greaterThan(interruptedScale + 0.1));- expect(harness.controller.stage, ImageZoomStage.gesture);- _expectFiniteAndInBounds(- pinchResult,- viewportSize: _viewportSize,- fittedImageSize: const Size(400, 800 / 3),- );-- await tester.pump(const Duration(milliseconds: 500));- _expectSameTransform(harness.controller.transform, pinchResult);- });});group("parent gesture handoff", () {@@ -547,29 +500,6 @@ void main() {},);- testWidgets("Hero bounds match the fitted image instead of the viewport", (- tester,- ) async {- final harness = await _pumpViewer(- tester,- image: landscapeImage,- heroTag: "fitted-image-hero",- );-- final viewportRect = Rect.fromLTWH(- harness.viewportTopLeft.dx,- harness.viewportTopLeft.dy,- _viewportSize.width,- _viewportSize.height,- );- final heroRect = tester.getRect(find.byType(Hero));-- expect(heroRect.width, closeTo(400, 0.01));- expect(heroRect.height, closeTo(800 / 3, 0.01));- expect(heroRect.center, viewportRect.center);- expect(heroRect, isNot(viewportRect));- });-testWidgets("same-aspect provider replacement during animation stays stable",(tester) async {@@ -646,7 +576,6 @@ Future<_ViewerHarness> _pumpViewer(ValueChanged<bool>? onInteractionLockChanged,BoxFit initialFit = BoxFit.contain,bool gesturesEnabled = true,- Object? heroTag,}) async {final viewportKey = GlobalKey();final controller = ImageZoomController();@@ -669,7 +598,6 @@ Future<_ViewerHarness> _pumpViewer(controller: controller,initialFit: initialFit,gesturesEnabled: gesturesEnabled,- heroTag: heroTag,loadingBuilder: _emptyLoadingBuilder,onInteractionLockChanged: onInteractionLockChanged,),