Fix test

Author: Emmanuel Garcia

shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java

@@ -232,7 +232,7 @@ public void getPlatformViewById__hybridComposition() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     platformViewsController.initializePlatformViewIfNeeded(platformViewId);
 
@@ -259,7 +259,7 @@ public void createPlatformViewMessage__initializesAndroidView() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     verify(viewFactory, times(1)).create(any(), eq(platformViewId), any());
   }
 
@@ -281,7 +281,7 @@ public void createPlatformViewMessage__throwsIfViewIsNull() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     assertEquals(ShadowFlutterJNI.getResponses().size(), 1);
 
     assertThrows(
@@ -309,7 +309,8 @@ public void onDetachedFromJNI_clearsPlatformViewContext() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(
+        jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ false);
 
     assertFalse(platformViewsController.contextToPlatformView.isEmpty());
     platformViewsController.onDetachedFromJNI();
@@ -334,7 +335,8 @@ public void onPreEngineRestart_clearsPlatformViewContext() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(
+        jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ false);
 
     assertFalse(platformViewsController.contextToPlatformView.isEmpty());
     platformViewsController.onDetachedFromJNI();
@@ -361,7 +363,7 @@ public void createPlatformViewMessage__throwsIfViewHasParent() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     assertEquals(ShadowFlutterJNI.getResponses().size(), 1);
 
     assertThrows(
@@ -393,7 +395,7 @@ public void disposeAndroidView__hybridComposition() {
     attach(jni, platformViewsController);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     platformViewsController.initializePlatformViewIfNeeded(platformViewId);
 
     assertNotNull(androidView.getParent());
@@ -404,7 +406,7 @@ public void disposeAndroidView__hybridComposition() {
     assertNull(androidView.getParent());
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     platformViewsController.initializePlatformViewIfNeeded(platformViewId);
 
     assertNotNull(androidView.getParent());
@@ -434,7 +436,7 @@ public void onEndFrame__destroysOverlaySurfaceAfterFrameOnFlutterSurfaceView() {
     jni.onFirstFrame();
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     // Produce a frame that displays a platform view and an overlay surface.
     platformViewsController.onBeginFrame();
@@ -497,7 +499,7 @@ public void onEndFrame__removesPlatformView() {
     jni.onFirstFrame();
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     // Simulate first frame from the framework.
     jni.onFirstFrame();
@@ -534,7 +536,7 @@ public void onEndFrame__removesPlatformViewParent() {
     jni.onFirstFrame();
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
     platformViewsController.initializePlatformViewIfNeeded(platformViewId);
     assertEquals(flutterView.getChildCount(), 2);
 
@@ -570,7 +572,7 @@ public void detach__destroysOverlaySurfaces() {
     jni.onFirstFrame();
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     // Produce a frame that displays a platform view and an overlay surface.
     platformViewsController.onBeginFrame();
@@ -703,7 +705,7 @@ public void convertPlatformViewRenderSurfaceAsDefault() {
     jni.onFirstFrame();
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     // Produce a frame that displays a platform view and an overlay surface.
     platformViewsController.onBeginFrame();
@@ -752,7 +754,7 @@ public void dontConverRenderSurfaceWhenFlagIsTrue() {
     synchronizeToNativeViewHierarchy(jni, platformViewsController, false);
 
     // Simulate create call from the framework.
-    createPlatformView(jni, platformViewsController, platformViewId, "testType");
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
 
     // Produce a frame that displays a platform view and an overlay surface.
     platformViewsController.onBeginFrame();
@@ -784,9 +786,10 @@ private static void createPlatformView(
       FlutterJNI jni,
       PlatformViewsController platformViewsController,
       int platformViewId,
-      String viewType) {
+      String viewType,
+      boolean hybrid) {
     final Map<String, Object> platformViewCreateArguments = new HashMap<>();
-    platformViewCreateArguments.put("hybrid", true);
+    platformViewCreateArguments.put("hybrid", hybrid);
     platformViewCreateArguments.put("id", platformViewId);
     platformViewCreateArguments.put("viewType", viewType);
     platformViewCreateArguments.put("direction", 0);