From c65e5e107e6c4b8bb603705c22a5adb450ca85f8 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 30 Apr 2022 14:35:42 +0800 Subject: [PATCH 1/2] Bump Robolectric to 4.8.1 1. Bump sdk to 32. 2. Remove icu4j from testImplementation because Robolectric has a higher icu4j dependency. Signed-off-by: utzcoz --- shell/platform/android/test/README.md | 2 +- shell/platform/android/test_runner/build.gradle | 3 +-- .../test_runner/src/main/resources/robolectric.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/shell/platform/android/test/README.md b/shell/platform/android/test/README.md index ef203e012cefe..2bc4dd380a1df 100644 --- a/shell/platform/android/test/README.md +++ b/shell/platform/android/test/README.md @@ -1,6 +1,6 @@ # Unit testing Java code -All Java code in the engine should now be able to be tested with Robolectric 4.7.3 +All Java code in the engine should now be able to be tested with Robolectric 4.8.1 and JUnit 4. The test suite has been added after the bulk of the Java code was first written, so most of these classes do not have existing tests. Ideally code after this point should be tested, either with unit tests here or with diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 5d6aca1b8dfe5..52499d2cf4473 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -69,8 +69,7 @@ android { implementation files(project.property("flutter_jar")) 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.7.3" + testImplementation "org.robolectric:robolectric:4.8.1" testImplementation "junit:junit:4.13" testImplementation "androidx.test.ext:junit:1.1.3" diff --git a/shell/platform/android/test_runner/src/main/resources/robolectric.properties b/shell/platform/android/test_runner/src/main/resources/robolectric.properties index ba72a7e57eb78..ac3b918cdd7d5 100644 --- a/shell/platform/android/test_runner/src/main/resources/robolectric.properties +++ b/shell/platform/android/test_runner/src/main/resources/robolectric.properties @@ -1,2 +1,2 @@ -sdk=31 +sdk=32 shadows=io.flutter.CustomShadowContextImpl From 6a200594aba6113d9536fb0a4ba104f4cddc4b18 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 18 Jun 2022 19:08:39 +0800 Subject: [PATCH 2/2] Fix disposeNullAndroidView with Robolectric 4.8.1 Before Robolectric 4.8, Surface#lockHardwareCanvas will throw exception at PlatformViewWrapper#setTexture, because Robolectric doesn't support to shadow Surface#lockHardwareCanvas, and it uses real Android logic with native pointer address is 0. This failure will ensure embeddedView's parent is null, because PlatformViewsController#createForTextureLayer will fail because of previous mentioned error, and PlatformViewsController#createForTextureLayer will not add embeddedView to wrapperView. So this test can pass. From Robolectric 4.8, it supports to shadow Surface#lockHardwareCanvas and it can pass with default true valid value, and PlatformViewsController#createForTextureLayer will run correctly and add embeddedView to wrapperView, and initializePlatformViewIfNeeded will fail because embeddedView's parent is not null. So adding a new shadow class called ShadowReleasedSurface to simulate previous Surface#lockHardwareCanvas failure to ensure this test can work with Robolectric 4.8 and later versions. But it is just a workaround, the root cause is this test case depends on just-failure behavior of Surface#lockHardwareCanvas in old Robolectric. Signed-off-by: utzcoz --- .../platform/PlatformViewsControllerTest.java | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java index d80e59186998b..770bb4f72d9b4 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java @@ -9,6 +9,7 @@ import android.content.Context; import android.content.res.AssetManager; +import android.graphics.Canvas; import android.graphics.SurfaceTexture; import android.util.SparseArray; import android.view.MotionEvent; @@ -51,6 +52,7 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import org.robolectric.shadows.ShadowSurface; import org.robolectric.shadows.ShadowSurfaceView; @Config(manifest = Config.NONE) @@ -469,7 +471,12 @@ public void disposeAndroidView__hybridComposition() { } @Test - @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class}) + @Config( + shadows = { + ShadowFlutterJNI.class, + ShadowReleasedSurface.class, + ShadowPlatformTaskQueue.class + }) public void disposeNullAndroidView() { PlatformViewsController platformViewsController = new PlatformViewsController(); @@ -489,6 +496,20 @@ public void disposeNullAndroidView() { attach(jni, platformViewsController); // Simulate create call from the framework. + // Before Robolectric 4.8, Surface#lockHardwareCanvas will throw exception at + // PlatformViewWrapper#setTexture, because Robolectric doesn't support to shadow + // Surface#lockHardwareCanvas, and it uses real Android logic with native pointer address is 0. + // This failure will ensure embeddedView's parent is null, because + // PlatformViewsController#createForTextureLayer will fail because of previous mentioned error, + // and PlatformViewsController#createForTextureLayer will not add embeddedView to wrapperView. + // So this test can pass. From Robolectric 4.8, it supports to shadow Surface#lockHardwareCanvas + // and it can pass with default true valid value, and + // PlatformViewsController#createForTextureLayer will run correctly and add embeddedView to + // wrapperView, and initializePlatformViewIfNeeded will fail because embeddedView's parent is + // not null. So adding a new shadow class called ShadowReleasedSurface to simulate previous + // Surface#lockHardwareCanvas failure to ensure this test can work with Robolectric 4.8 and + // later versions. But it is just a workaround, the root cause is this test case depends on + // just-failure behavior of Surface#lockHardwareCanvas in old Robolectric. createPlatformView( jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ false); platformViewsController.initializePlatformViewIfNeeded(platformViewId); @@ -1110,6 +1131,22 @@ public void dispatch(Runnable runnable) { } } + /** + * The shadow class of {@link Surface} to simulate released surface. + * + *

This shadow class's usage is restricted, not for normal purpose. + */ + @Implements(Surface.class) + public static class ShadowReleasedSurface extends ShadowSurface { + public ShadowReleasedSurface() {} + + @Implementation + @Override + protected Canvas lockHardwareCanvas() { + throw new IllegalStateException("Surface has already been released."); + } + } + @Implements(FlutterJNI.class) public static class ShadowFlutterJNI { private static SparseArray replies = new SparseArray<>();