better

Author: dnfield

testing/scenario_app/android/BUILD.gn

@@ -7,9 +7,7 @@ import("//flutter/testing/rules/android.gni")
 _android_sources = [
   "app/build.gradle",
   "app/src/androidTest/java/dev/flutter/TestRunner.java",
-  "app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java",
   "app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java",
-  "app/src/androidTest/java/dev/flutter/scenariosui/ArgumentAwareIntent.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/GetBitmapTests.java",

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java

@@ -8,10 +8,21 @@
 import androidx.annotation.Nullable;
 import androidx.test.runner.AndroidJUnitRunner;
 import dev.flutter.scenariosui.ScreenshotUtil;
+import io.flutter.FlutterInjector;
 
 public class TestRunner extends AndroidJUnitRunner {
   @Override
   public void onCreate(@Nullable Bundle arguments) {
+    String[] engineArguments = null;
+    if ("true".equals(arguments.getString("enable-impeller"))) {
+      // Set up the global settings object so that Impeller is enabled for all tests.
+      engineArguments = new String[] {"--enable-impeller=true"};
+    }
+    // For consistency, just always initilaize FlutterJNI etc.
+    FlutterInjector.instance().flutterLoader().startInitialization(getTargetContext());
+    FlutterInjector.instance()
+        .flutterLoader()
+        .ensureInitializationComplete(getTargetContext(), engineArguments);
     ScreenshotUtil.onCreate();
     super.onCreate(arguments);
   }

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java

@@ -18,11 +18,9 @@ public final class DrawSolidBlueScreenTest {
       new ActivityTestRule<>(
           PlatformViewsActivity.class, /*initialTouchMode=*/ false, /*launchActivity=*/ false);
 
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
-
   @Test
   public void test() throws Exception {
-    Intent intent = intentRule.getIntent();
+    Intent intent = new Intent(Intent.ACTION_MAIN);
     intent.putExtra("scenario_name", "solid_blue");
     ScreenshotUtil.capture(activityRule.launchActivity(intent), "DrawSolidBlueScreenTest");
   }

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ArgumentAwareIntent.java

@@ -33,11 +33,9 @@ public class ExternalTextureTests {
           /*initialTouchMode=*/ false,
           /*launchActivity=*/ false);
 
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
-
   @Before
   public void setUp() {
-    intent = intentRule.getIntent();
+    intent = new Intent(Intent.ACTION_MAIN);
   }
 
   @Test

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java

@@ -25,11 +25,9 @@ public class GetBitmapTests {
       new ActivityTestRule<>(
           GetBitmapActivity.class, /*initialTouchMode=*/ false, /*launchActivity=*/ false);
 
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
-
   @Test
   public void getBitmap() throws Exception {
-    Intent intent = intentRule.getIntent();
+    Intent intent = new Intent(Intent.ACTION_MAIN);
     intent.putExtra("scenario_name", "get_bitmap");
     GetBitmapActivity activity = activityRule.launchActivity(intent);
     Bitmap bitmap = activity.getBitmap();

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java

@@ -23,12 +23,10 @@ public class MemoryLeakTests {
       new ActivityTestRule<>(
           PlatformViewsActivity.class, /*initialTouchMode=*/ false, /*launchActivity=*/ false);
 
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
-
   @Test
   @FailTestOnLeak
   public void platformViewHybridComposition_launchActivityFinishAndLaunchAgain() throws Exception {
-    Intent intent = intentRule.getIntent();
+    Intent intent = new Intent(Intent.ACTION_MAIN);
     intent.putExtra("scenario_name", "platform_view");
     intent.putExtra("use_android_view", true);
     intent.putExtra("view_type", PlatformViewsActivity.TEXT_VIEW_PV);

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/GetBitmapTests.java

@@ -20,7 +20,6 @@
 @LargeTest
 public class PlatformTextureUiTests {
   Intent intent;
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -33,7 +32,7 @@ private static String goldName(String suffix) {
 
   @Before
   public void setUp() {
-    intent = intentRule.getIntent();
+    intent = new Intent(Intent.ACTION_MAIN);
     // Render a texture.
     intent.putExtra("use_android_view", false);
     intent.putExtra("view_type", PlatformViewsActivity.TEXT_VIEW_PV);

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java

@@ -20,7 +20,6 @@
 @LargeTest
 public class PlatformViewUiTests {
   Intent intent;
-  @Rule @NonNull public ArgumentAwareIntent intentRule = new ArgumentAwareIntent();
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -33,7 +32,7 @@ private static String goldName(String suffix) {
 
   @Before
   public void setUp() {
-    intent = intentRule.getIntent();
+    intent = new Intent(Intent.ACTION_MAIN);
     // Render a native android view.
     intent.putExtra("use_android_view", true);
     intent.putExtra("view_type", PlatformViewsActivity.TEXT_VIEW_PV);