From 5b4a05fa8914e8ee590ba0331e54f92b22bda2ad Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Wed, 23 Aug 2023 13:04:17 -0700 Subject: [PATCH] Followup to https://github.com/flutter/engine/pull/44982 (flutter/engine#45018) One change was missing from https://github.com/flutter/engine/pull/44982 when I applied auto submit. --- .../embedding/android/FlutterFragmentTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java index 4b6c223530d..06b30a99e02 100644 --- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java +++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java @@ -284,8 +284,11 @@ public class FlutterFragmentTest { } @SuppressWarnings("deprecation") - // Robolectric.setupActivity - // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151 + private FragmentActivity getMockFragmentActivity() { + // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151 + return Robolectric.setupActivity(FragmentActivity.class); + } + @Test public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() { // We need to mock FlutterJNI to avoid triggering native code. @@ -300,7 +303,7 @@ public class FlutterFragmentTest { FlutterFragment.withCachedEngine("my_cached_engine") .shouldAutomaticallyHandleOnBackPressed(true) .build(); - FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class); + FragmentActivity activity = getMockFragmentActivity(); activity .getSupportFragmentManager() .beginTransaction() @@ -337,7 +340,7 @@ public class FlutterFragmentTest { FlutterFragment.withCachedEngine("my_cached_engine") .shouldAutomaticallyHandleOnBackPressed(true) .build(); - FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class); + FragmentActivity activity = getMockFragmentActivity(); activity .getSupportFragmentManager() .beginTransaction()