fix test via injector

Author: xster

shell/platform/android/io/flutter/FlutterInjector.java

@@ -28,6 +28,7 @@ public final class FlutterInjector {
    * <p>This can only be called at the beginning of the program before the {@link #instance()} is
    * accessed.
    */
+  @VisibleForTesting
   public static void setInstance(@NonNull FlutterInjector injector) {
     if (accessed) {
       throw new IllegalStateException(

shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java

@@ -18,13 +18,13 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
+import io.flutter.FlutterInjector;
 import io.flutter.Log;
 import io.flutter.app.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
-import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.plugin.platform.PlatformPlugin;
 import java.util.Arrays;
@@ -369,7 +369,7 @@ private void doInitialFlutterViewRun() {
 
     String appBundlePathOverride = host.getAppBundlePath();
     if (appBundlePathOverride == null || appBundlePathOverride.isEmpty()) {
-      appBundlePathOverride = FlutterLoader.getInstance().findAppBundlePath();
+      appBundlePathOverride = FlutterInjector.instance().flutterLoader().findAppBundlePath();
     }
 
     // Configure the Dart entrypoint and execute it.

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java

@@ -17,11 +17,13 @@
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
+import io.flutter.FlutterInjector;
 import io.flutter.embedding.android.FlutterActivityAndFragmentDelegate.Host;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.plugins.activity.ActivityControlSurface;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
@@ -51,6 +53,7 @@ public class FlutterActivityAndFragmentDelegateTest {
 
   @Before
   public void setup() {
+    FlutterInjector.reset();
     // Create a mocked FlutterEngine for the various interactions required by the delegate
     // being tested.
     mockFlutterEngine = mockFlutterEngine();
@@ -310,13 +313,18 @@ public void itExecutesDartEntrypointProvidedByHost() {
   @Test
   public void itUsesDefaultFlutterLoaderAppBundlePathWhenUnspecified() {
     // ---- Test setup ----
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    when(mockFlutterLoader.findAppBundlePath()).thenReturn("default_flutter_assets/path");
+    FlutterInjector.setInstance(
+        new FlutterInjector.Builder().setFlutterLoader(mockFlutterLoader).build());
+
     // Set Dart entrypoint parameters on fake host.
     when(mockHost.getAppBundlePath()).thenReturn(null);
     when(mockHost.getDartEntrypointFunctionName()).thenReturn("myEntrypoint");
 
     // Create the DartEntrypoint that we expect to be executed.
     DartExecutor.DartEntrypoint dartEntrypoint =
-        new DartExecutor.DartEntrypoint("flutter_assets", "myEntrypoint");
+        new DartExecutor.DartEntrypoint("default_flutter_assets/path", "myEntrypoint");
 
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);