Skip to content

Commit cb3fd95

Browse files
authored
Update mockito to 5.17.0 from 4.7.0, prework for android 36 support (#167573)
This updates all the dependencies in engine/src/flutter/shell/platform/android/test_runner/build.gradle and ignores the play store deprecration so I could get android studio to give me other lint help. This work is required to unblock @jesswrd's work to update the engine to use android 36. Deleted mockito-inline because it is automatically used after 5.2.0 according to Maven docs: https://mvnrepository.com/artifact/org.mockito/mockito-inline/5.2.0" - **Remove config none annotations that have been deprecrated since roboletrics 4.0.1** - **Update all dependencies used in test runner, passes for spellcheckplugintest** ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
1 parent b94e21b commit cb3fd95

61 files changed

Lines changed: 15 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

engine/src/flutter/shell/platform/android/test/io/flutter/FlutterInjectorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import org.junit.runner.RunWith;
2626
import org.mockito.Mock;
2727
import org.mockito.MockitoAnnotations;
28-
import org.robolectric.annotation.Config;
2928

30-
@Config(manifest = Config.NONE)
3129
@RunWith(AndroidJUnit4.class)
3230
public class FlutterInjectorTest {
3331
@Mock FlutterLoader mockFlutterLoader;

engine/src/flutter/shell/platform/android/test/io/flutter/LogTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import org.junit.Test;
1212
import org.junit.runner.RunWith;
1313
import org.robolectric.RobolectricTestRunner;
14-
import org.robolectric.annotation.Config;
1514

16-
@Config(manifest = Config.NONE)
1715
@RunWith(RobolectricTestRunner.class)
1816
public class LogTest {
1917

engine/src/flutter/shell/platform/android/test/io/flutter/SmokeTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import androidx.test.ext.junit.runners.AndroidJUnit4;
1111
import org.junit.Test;
1212
import org.junit.runner.RunWith;
13-
import org.robolectric.annotation.Config;
1413

1514
/** Basic smoke test verifying that Robolectric is loaded and mocking out Android APIs. */
16-
@Config(manifest = Config.NONE)
1715
@RunWith(AndroidJUnit4.class)
1816
public class SmokeTest {
1917
@Test

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.mockito.MockitoAnnotations;
3333
import org.robolectric.annotation.Config;
3434

35-
@Config(manifest = Config.NONE)
3635
@RunWith(AndroidJUnit4.class)
3736
@TargetApi(API_LEVELS.API_28)
3837
public class AndroidTouchProcessorTest {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@
6565
import org.mockito.ArgumentCaptor;
6666
import org.robolectric.Robolectric;
6767
import org.robolectric.android.controller.ActivityController;
68-
import org.robolectric.annotation.Config;
6968

70-
@Config(manifest = Config.NONE)
7169
@RunWith(AndroidJUnit4.class)
7270
public class FlutterActivityAndFragmentDelegateTest {
7371
private final Context ctx = ApplicationProvider.getApplicationContext();

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.robolectric.android.controller.ActivityController;
6161
import org.robolectric.annotation.Config;
6262

63-
@Config(manifest = Config.NONE)
6463
@RunWith(AndroidJUnit4.class)
6564
public class FlutterActivityTest {
6665
private final Context ctx = ApplicationProvider.getApplicationContext();

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
import org.mockito.stubbing.Answer;
4747
import org.robolectric.Robolectric;
4848
import org.robolectric.android.controller.ActivityController;
49-
import org.robolectric.annotation.Config;
5049

51-
@Config(manifest = Config.NONE)
5250
@RunWith(AndroidJUnit4.class)
5351
public class FlutterAndroidComponentTest {
5452
private final Context ctx = ApplicationProvider.getApplicationContext();

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.robolectric.Robolectric;
4646
import org.robolectric.annotation.Config;
4747

48-
@Config(manifest = Config.NONE)
4948
@RunWith(AndroidJUnit4.class)
5049
public class FlutterFragmentActivityTest {
5150
private final Context ctx = ApplicationProvider.getApplicationContext();

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
import org.junit.Test;
3535
import org.junit.runner.RunWith;
3636
import org.robolectric.Robolectric;
37-
import org.robolectric.annotation.Config;
3837

39-
@Config(manifest = Config.NONE)
4038
@RunWith(AndroidJUnit4.class)
4139
public class FlutterFragmentTest {
4240
private final Context ctx = ApplicationProvider.getApplicationContext();

engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterSurfaceViewTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import io.flutter.embedding.engine.renderer.FlutterRenderer;
2323
import org.junit.Test;
2424
import org.junit.runner.RunWith;
25-
import org.robolectric.annotation.Config;
2625

27-
@Config(manifest = Config.NONE)
2826
@RunWith(AndroidJUnit4.class)
2927
@TargetApi(API_LEVELS.API_30)
3028
public class FlutterSurfaceViewTest {

0 commit comments

Comments
 (0)