Fix scenario platform view tests on Android (#18332)

flutter · May 13, 2020 · 480d8e4 · 480d8e4
1 parent 80fa77e
commit 480d8e4
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 7 deletions.
diff --git a/...creenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png b/...creenshots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformView.png
diff --git a/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png b/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewClippath.png
diff --git a/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png b/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprect.png
diff --git a/...s/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png b/...s/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewCliprrect.png
diff --git a/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png b/...ts/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewMultiple.png
diff --git a/...riosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png b/...riosui.PlatformTextureUiTests__testPlatformViewMultipleBackgroundForeground.png
diff --git a/...scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png b/...scenariosui.PlatformTextureUiTests__testPlatformViewMultipleWithoutOverlays.png
diff --git a/...ots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png b/...ots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewOpacity.png
diff --git a/...hots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png b/...hots/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewRotate.png
diff --git a/...s/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png b/...s/dev.flutter.scenariosui.PlatformTextureUiTests__testPlatformViewTransform.png
diff --git a/...scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png b/...scenariosui.PlatformTextureUiTests__testPlatformViewTwoIntersectingOverlays.png
diff --git a/testing/scenario_app/lib/src/platform_view.dart b/testing/scenario_app/lib/src/platform_view.dart
@@ -446,9 +446,6 @@ class PlatformViewClipPathScenario extends PlatformViewScenario {
 
     builder.pushOffset(0, 0);
 
-    // Create a path of rectangle with width of 200 and height of 300, starting from (100, 100).
-    //
-    // Refer to "../../ios/Scenarios/Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone SE_simulator.png" for the exact path after clipping.
     final Path path = Path()
       ..moveTo(100, 100)
       ..quadraticBezierTo(50, 250, 100, 400)
@@ -632,11 +629,18 @@ mixin _BasePlatformViewScenarioMixin on Scenario {
     );
   }
 
-  void _addPlatformViewtoScene(SceneBuilder sceneBuilder, int viewId, double width, double height) {
+  void _addPlatformViewtoScene(
+    SceneBuilder sceneBuilder,
+    int viewId,
+    double width,
+    double height, {
+    Offset overlayOffset,
+  }) {
+    overlayOffset ??= const Offset(50, 50);
     if (Platform.isIOS) {
-      sceneBuilder.addPlatformView(viewId, width: width, height: height);
+      sceneBuilder.addPlatformView(viewId, offset: overlayOffset, width: width, height: height);
     } else if (Platform.isAndroid && _textureId != null) {
-      sceneBuilder.addTexture(_textureId, offset: const Offset(150, 300), width: width, height: height);
+      sceneBuilder.addTexture(_textureId, offset: overlayOffset, width: width, height: height);
     } else {
       throw UnsupportedError('Platform ${Platform.operatingSystem} is not supported');
     }
@@ -649,7 +653,13 @@ mixin _BasePlatformViewScenarioMixin on Scenario {
     Offset overlayOffset,
   }) {
     overlayOffset ??= const Offset(50, 50);
-    _addPlatformViewtoScene(sceneBuilder, viewId, 500, 500);
+    _addPlatformViewtoScene(
+      sceneBuilder,
+      viewId,
+      500,
+      500,
+      overlayOffset: overlayOffset,
+    );
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
     canvas.drawCircle(