From 1b4353ed4d7412e91f88afff09eb537a0448ae0d Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 20 May 2020 01:42:14 -0700 Subject: [PATCH 1/3] Move robolectric tests to sdk 28 --- DEPS | 2 +- shell/platform/android/embedding_bundle/build.gradle | 4 ++-- shell/platform/android/robolectric.properties | 4 +++- .../test/io/flutter/embedding/android/FlutterViewTest.java | 2 -- .../flutter/plugin/editing/InputConnectionAdaptorTest.java | 2 +- .../test/io/flutter/plugin/editing/TextInputPluginTest.java | 2 +- .../flutter/plugin/platform/SingleViewPresentationTest.java | 5 +---- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index 9cc9a0e6f72c7..4400aaeca1f56 100644 --- a/DEPS +++ b/DEPS @@ -502,7 +502,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/embedding_bundle', - 'version': 'last_updated:2020-03-13T15:42:26-0700' + 'version': 'last_updated:2020-05-20T01:36:16-0700' } ], 'condition': 'download_android_deps', diff --git a/shell/platform/android/embedding_bundle/build.gradle b/shell/platform/android/embedding_bundle/build.gradle index a76082267c3a7..c210e89652768 100644 --- a/shell/platform/android/embedding_bundle/build.gradle +++ b/shell/platform/android/embedding_bundle/build.gradle @@ -37,7 +37,7 @@ configurations { } android { - compileSdkVersion 28 + compileSdkVersion 29 dependencies { embedding "androidx.annotation:annotation:1.1.0" @@ -52,7 +52,7 @@ android { // TODO(xster): remove these android-all compile time dependencies. // Use https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/LegacyDependencyResolver.java#L24 // and specify them as runtime dependencies. - embeddingTesting "org.robolectric:android-all:8.1.0-robolectric-4611349" + embeddingTesting "org.robolectric:android-all:9-robolectric-4913185-2" // Get robolectric shadows for SDK=16 used by PlatformPluginTest. embeddingTesting_v16 "org.robolectric:android-all:4.1.2_r1-robolectric-r1" embeddingTesting "androidx.fragment:fragment-testing:1.1.0" diff --git a/shell/platform/android/robolectric.properties b/shell/platform/android/robolectric.properties index 7378b4e6a2ca7..a1bebb3f0780d 100644 --- a/shell/platform/android/robolectric.properties +++ b/shell/platform/android/robolectric.properties @@ -1,2 +1,4 @@ # Match the value at shell/platform/android/embedding_bundle/build.gradle. -sdk=29 +# TODO(https://github.com/flutter/flutter/issues/57655): figure out +# what's wrong with sdk=29. +sdk=28 diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java index 5b6567377ee96..170677f0ed6de 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java @@ -8,7 +8,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.annotation.TargetApi; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -42,7 +41,6 @@ @Config(manifest = Config.NONE) @RunWith(RobolectricTestRunner.class) -@TargetApi(29) public class FlutterViewTest { @Mock FlutterJNI mockFlutterJni; @Mock FlutterLoader mockFlutterLoader; diff --git a/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java b/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java index 37ae918c4aec8..bdf2d6b48c5d6 100644 --- a/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java +++ b/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java @@ -34,7 +34,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowClipboardManager; -@Config(manifest = Config.NONE, sdk = 27, shadows = ShadowClipboardManager.class) +@Config(manifest = Config.NONE, shadows = ShadowClipboardManager.class) @RunWith(RobolectricTestRunner.class) public class InputConnectionAdaptorTest { @Test diff --git a/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java b/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java index 371961338351b..f12daf40c13e3 100644 --- a/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java @@ -52,7 +52,7 @@ import org.robolectric.shadows.ShadowBuild; import org.robolectric.shadows.ShadowInputMethodManager; -@Config(manifest = Config.NONE, shadows = TextInputPluginTest.TestImm.class, sdk = 27) +@Config(manifest = Config.NONE, shadows = TextInputPluginTest.TestImm.class) @RunWith(RobolectricTestRunner.class) public class TextInputPluginTest { // Verifies the method and arguments for a captured method call. diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java index f38d91643484d..bbddcc49661ef 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java @@ -5,7 +5,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.annotation.TargetApi; import android.content.Context; import android.hardware.display.DisplayManager; import android.view.Display; @@ -21,10 +20,8 @@ @Config( manifest = Config.NONE, - shadows = {ShadowInputMethodManager.class, ShadowDisplayManager.class, ShadowDisplay.class}, - sdk = 27) + shadows = {ShadowInputMethodManager.class, ShadowDisplayManager.class, ShadowDisplay.class}) @RunWith(RobolectricTestRunner.class) -@TargetApi(27) public class SingleViewPresentationTest { @Test public void returnsOuterContextInputMethodManager() { From eff4602665d5ea64dd26496b280615f4ae62ad89 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 20 May 2020 01:48:58 -0700 Subject: [PATCH 2/3] lint --- .../test/io/flutter/embedding/android/FlutterViewTest.java | 2 ++ .../io/flutter/plugin/platform/SingleViewPresentationTest.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java index 170677f0ed6de..cf0fdcc589808 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java @@ -8,6 +8,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.annotation.TargetApi; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -41,6 +42,7 @@ @Config(manifest = Config.NONE) @RunWith(RobolectricTestRunner.class) +@TargetApi(28) public class FlutterViewTest { @Mock FlutterJNI mockFlutterJni; @Mock FlutterLoader mockFlutterLoader; diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java index bbddcc49661ef..5023a83e2b471 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java @@ -5,6 +5,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import android.annotation.TargetApi; import android.content.Context; import android.hardware.display.DisplayManager; import android.view.Display; @@ -21,7 +22,9 @@ @Config( manifest = Config.NONE, shadows = {ShadowInputMethodManager.class, ShadowDisplayManager.class, ShadowDisplay.class}) + @RunWith(RobolectricTestRunner.class) +@TargetApi(28) public class SingleViewPresentationTest { @Test public void returnsOuterContextInputMethodManager() { From 6e02a1cd1629b530044ec39138c9b85dc3ba14a0 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Wed, 20 May 2020 01:55:08 -0700 Subject: [PATCH 3/3] autoformat --- .../io/flutter/plugin/platform/SingleViewPresentationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java index 5023a83e2b471..3ef50b9cf3b2d 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java @@ -22,7 +22,6 @@ @Config( manifest = Config.NONE, shadows = {ShadowInputMethodManager.class, ShadowDisplayManager.class, ShadowDisplay.class}) - @RunWith(RobolectricTestRunner.class) @TargetApi(28) public class SingleViewPresentationTest {