Revert back to ActivityTestRule

MarcusWolschon · Sep 19, 2023 · 96633c7 · 96633c7
1 parent 6b7e223
commit 96633c7
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/androidTest/java/de/blau/android/gpx/GpxTest.java b/src/androidTest/java/de/blau/android/gpx/GpxTest.java
@@ -21,17 +21,15 @@
 import org.junit.runner.RunWith;
 
 import android.app.Instrumentation;
-import android.app.Instrumentation.ActivityMonitor;
 import android.content.Context;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationManager;
 import androidx.annotation.NonNull;
-import androidx.test.core.app.ActivityScenario;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
 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.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
@@ -69,11 +67,8 @@ public class GpxTest {
     MockWebServer   tileServer      = null;
     Preferences     prefs           = null;
 
-    /**
-     * Manual start of activity so that we can set up the monitor for main
-     */
     @Rule
-    public ActivityScenarioRule<Main> activityScenarioRule = new ActivityScenarioRule<>(Main.class);
+    public ActivityTestRule<Main> mActivityRule = new ActivityTestRule<>(Main.class);
 
     /**
      * Pre-test setup
@@ -85,10 +80,7 @@ public void setup() {
         // this sets the mock location permission
         instrumentation.getUiAutomation().executeShellCommand("appops set de.blau.android android:mock_location allow");
 
-        ActivityMonitor monitor = instrumentation.addMonitor(Main.class.getName(), null, false);
-        ActivityScenario scenario = ActivityScenario.launch(Main.class);
-        main = (Main) instrumentation.waitForMonitorWithTimeout(monitor, 30000);
-        instrumentation.removeMonitor(monitor);
+        main = mActivityRule.getActivity();
 
         tileServer = MockTileServer.setupTileServer(main, "ersatz_background.mbt", true);
         prefs = App.getPreferences(main);