Use non-deprecated replacements for Android JUnit and test instrument…

…ation (flutter#51854) Just removing some of the noise of walking through Java files in Android Studio, should be a NO-OP[^1]. - `androidx.test.runner.AndroidJUnit4` -> `androidx.test.ext.junit.runners.AndroidJUnit4` - `androidx.test.InstrumentationRegistry` -> `androidx.test.platform.app.InstrumentationRegistry` [^1]: Famous last words.
mnordine · Apr 3, 2024 · bef3bbe · bef3bbe
1 parent 5fc83bc
commit bef3bbe
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/...o_app/android/app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java b/...o_app/android/app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java
@@ -7,8 +7,8 @@
 import static org.junit.Assert.*;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -22,7 +22,7 @@ public class ExampleInstrumentedTest {
   @Test
   public void useAppContext() {
     // Context of the app under test.
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     assertEquals("dev.flutter.scenarios", appContext.getPackageName());
   }

diff --git a/...app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java b/...app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/GetBitmapTests.java b/...scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/GetBitmapTests.java
@@ -9,9 +9,9 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.GetBitmapActivity;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...cenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java b/...cenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import leakcanary.FailTestOnLeak;
 import org.junit.Rule;

diff --git a/..._app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java b/..._app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java
@@ -8,10 +8,10 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...rio_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java b/...rio_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java
@@ -8,10 +8,10 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewBadContextUiTest.java b/...androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewBadContextUiTest.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...oidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewHybridFallbackUiTest.java b/...oidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewHybridFallbackUiTest.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewHybridUiTest.java b/...src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewHybridUiTest.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java b/...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java
@@ -8,10 +8,10 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Ignore;

diff --git a/...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java b/...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java
@@ -8,10 +8,10 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...enario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnEngineTests.java b/...enario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnEngineTests.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.SpawnedEngineActivity;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...io_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java b/...io_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java
@@ -6,9 +6,9 @@
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.SpawnMultiEngineActivity;
 import org.junit.Before;
 import org.junit.Rule;