diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java index 47204fee28..02b0f2d974 100644 --- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java +++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.accessibility.AccessibilityEvent; +import android.widget.FrameLayout; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import io.flutter.embedding.android.AndroidTouchProcessor; @@ -231,10 +232,14 @@ public class FlutterMutatorViewTest { } @Implements(ViewGroup.class) - public static class ShadowViewGroup extends org.robolectric.shadows.ShadowView { + public static class ShadowViewGroup extends org.robolectric.shadows.ShadowViewGroup { @Implementation - public boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) { + protected boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) { return true; } } + + @Implements(FrameLayout.class) + public static class ShadowFrameLayout + extends io.flutter.plugin.platform.PlatformViewWrapperTest.ShadowViewGroup {} } diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java index 29ad40daae..2bfe689abf 100644 --- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java +++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java @@ -19,6 +19,7 @@ import android.view.View.OnFocusChangeListener; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.accessibility.AccessibilityEvent; +import android.widget.FrameLayout; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; @@ -45,10 +46,6 @@ public class PlatformViewWrapperTest { } @Test - @Config( - shadows = { - ShadowView.class, - }) public void draw_withoutSurface() { final PlatformViewWrapper wrapper = new PlatformViewWrapper(ctx) { @@ -195,6 +192,7 @@ public class PlatformViewWrapperTest { @Test @Config( shadows = { + ShadowFrameLayout.class, ShadowViewGroup.class, }) public void ignoreAccessibilityEvents() { @@ -213,6 +211,7 @@ public class PlatformViewWrapperTest { @Test @Config( shadows = { + ShadowFrameLayout.class, ShadowViewGroup.class, }) public void sendAccessibilityEvents() { @@ -234,14 +233,15 @@ public class PlatformViewWrapperTest { assertTrue(eventSent); } - @Implements(View.class) - public static class ShadowView {} - @Implements(ViewGroup.class) - public static class ShadowViewGroup extends org.robolectric.shadows.ShadowView { + public static class ShadowViewGroup extends org.robolectric.shadows.ShadowViewGroup { @Implementation - public boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) { + protected boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) { return true; } } + + @Implements(FrameLayout.class) + public static class ShadowFrameLayout + extends io.flutter.plugin.platform.PlatformViewWrapperTest.ShadowViewGroup {} } diff --git a/engine/src/flutter/shell/platform/android/test_runner/build.gradle b/engine/src/flutter/shell/platform/android/test_runner/build.gradle index 609d4810f6..9bd982a2fd 100644 --- a/engine/src/flutter/shell/platform/android/test_runner/build.gradle +++ b/engine/src/flutter/shell/platform/android/test_runner/build.gradle @@ -70,7 +70,7 @@ android { testImplementation "androidx.test:core:1.4.0" testImplementation "com.google.android.play:core:1.8.0" testImplementation "com.ibm.icu:icu4j:69.1" - testImplementation "org.robolectric:robolectric:4.10.3" + testImplementation "org.robolectric:robolectric:4.11" testImplementation "junit:junit:4.13.2" testImplementation "androidx.test.ext:junit:1.1.4-alpha07"