Fix Screenshot Tests

app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt

@@ -7,11 +7,14 @@
  */
 package com.nextcloud.client
 
+import android.content.Intent
 import android.view.View
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.contrib.DrawerActions
-import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.facebook.testing.screenshot.Screenshot
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.R
@@ -22,61 +25,75 @@ import com.owncloud.android.lib.resources.activities.models.PreviewObject
 import com.owncloud.android.lib.resources.status.OCCapability
 import com.owncloud.android.ui.activities.ActivitiesActivity
 import com.owncloud.android.utils.ScreenshotTest
+import org.junit.After
 import org.junit.Rule
 import org.junit.Test
 import java.util.GregorianCalendar
 
 class ActivitiesActivityIT : AbstractIT() {
+    private lateinit var scenario: ActivityScenario<ActivitiesActivity>
+    val intent = Intent(ApplicationProvider.getApplicationContext(), ActivitiesActivity::class.java)
+
     @get:Rule
-    var activityRule = IntentsTestRule(ActivitiesActivity::class.java, true, false)
+    val activityRule = ActivityScenarioRule<ActivitiesActivity>(intent)
+
+    @After
+    fun cleanup() {
+        scenario.close()
+    }
 
     @Test
     @ScreenshotTest
     fun openDrawer() {
-        val sut = activityRule.launchActivity(null)
-        shortSleep()
-        Espresso.onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
-        sut.runOnUiThread {
-            sut.dismissSnackbar()
+        scenario = activityRule.scenario
+        scenario.onActivity { sut ->
+            onIdleSync {
+                shortSleep()
+                Espresso.onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
+                sut.runOnUiThread {
+                    sut.dismissSnackbar()
+                }
+                shortSleep()
+                screenshot(sut)
+            }
         }
-        shortSleep()
-        waitForIdleSync()
-        screenshot(sut)
     }
 
     @Test
     @ScreenshotTest
     fun loading() {
-        val sut: ActivitiesActivity = activityRule.launchActivity(null).apply {
-            runOnUiThread {
-                dismissSnackbar()
-                binding.emptyList.root.visibility = View.GONE
-                binding.swipeContainingList.visibility = View.GONE
-                binding.loadingContent.visibility = View.VISIBLE
+        scenario = activityRule.scenario
+        scenario.onActivity { sut ->
+            sut.runOnUiThread {
+                sut.dismissSnackbar()
+                sut.binding.emptyList.root.visibility = View.GONE
+                sut.binding.swipeContainingList.visibility = View.GONE
+                sut.binding.loadingContent.visibility = View.VISIBLE
             }
-        }
 
-        shortSleep()
-        waitForIdleSync()
+            shortSleep()
 
-        Screenshot.snap(sut.binding.loadingContent).record()
+            onIdleSync {
+                Screenshot.snap(sut.binding.loadingContent).record()
+            }
+        }
     }
 
     @Test
     @ScreenshotTest
     fun empty() {
-        val sut: ActivitiesActivity = activityRule.launchActivity(null)
-
-        sut.runOnUiThread {
-            sut.showActivities(mutableListOf(), nextcloudClient, -1)
-            sut.setProgressIndicatorState(false)
-            sut.dismissSnackbar()
+        scenario = activityRule.scenario
+        scenario.onActivity { sut ->
+            sut.runOnUiThread {
+                sut.showActivities(mutableListOf(), nextcloudClient, -1)
+                sut.setProgressIndicatorState(false)
+                sut.dismissSnackbar()
+            }
+            shortSleep()
+            onIdleSync {
+                screenshot(sut.binding.emptyList.emptyListView)
+            }
         }
-
-        shortSleep()
-        waitForIdleSync()
-
-        screenshot(sut)
     }
 
     @Test
@@ -87,8 +104,6 @@ class ActivitiesActivityIT : AbstractIT() {
         capability.versionMayor = 20
         fileDataStorageManager.saveCapabilities(capability)
 
-        val sut: ActivitiesActivity = activityRule.launchActivity(null)
-
         val date = GregorianCalendar()
         date.set(2005, 4, 17, 10, 35, 30) // random date
 
@@ -159,35 +174,40 @@ class ActivitiesActivityIT : AbstractIT() {
             )
         )
 
-        sut.runOnUiThread {
-            sut.showActivities(activities as List<Any>?, nextcloudClient, -1)
-            sut.setProgressIndicatorState(false)
-            sut.dismissSnackbar()
-        }
+        scenario = activityRule.scenario
+        scenario.onActivity { sut ->
+            sut.runOnUiThread {
+                sut.showActivities(activities as List<Any>?, nextcloudClient, -1)
+                sut.setProgressIndicatorState(false)
+                sut.dismissSnackbar()
+            }
 
-        longSleep()
-        waitForIdleSync()
+            longSleep()
 
-        screenshot(sut)
+            onIdleSync {
+                screenshot(sut)
+            }
+        }
     }
 
     @Test
     @ScreenshotTest
     fun error() {
-        val sut: ActivitiesActivity = activityRule.launchActivity(null)
-
-        shortSleep()
+        scenario = activityRule.scenario
+        scenario.onActivity { sut ->
+            shortSleep()
+
+            sut.runOnUiThread {
+                sut.showEmptyContent("Error", "Error! Please try again later!")
+                sut.setProgressIndicatorState(false)
+                sut.dismissSnackbar()
+            }
 
-        sut.runOnUiThread {
-            sut.showEmptyContent("Error", "Error! Please try again later!")
-            sut.setProgressIndicatorState(false)
-            sut.dismissSnackbar()
+            shortSleep()
+            shortSleep()
+            onIdleSync {
+                screenshot(sut)
+            }
         }
-
-        shortSleep()
-        shortSleep()
-        waitForIdleSync()
-
-        screenshot(sut)
     }
 }

app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java

@@ -6,6 +6,7 @@
  */
 package com.nextcloud.client;
 
+import android.content.Intent;
 import android.widget.TextView;
 
 import com.nextcloud.test.GrantStoragePermissionRule;
@@ -14,28 +15,43 @@
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.utils.ScreenshotTest;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import androidx.test.espresso.intent.rule.IntentsTestRule;
-
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
 
 public class AuthenticatorActivityIT extends AbstractIT {
     private static final String URL = "cloud.nextcloud.com";
-    @Rule public IntentsTestRule<AuthenticatorActivity> activityRule = new IntentsTestRule<>(AuthenticatorActivity.class,
-                                                                                             true,
-                                                                                             false);
+
+    private ActivityScenario<AuthenticatorActivity> scenario;
+
+    @Before
+    public void setUp() {
+        Intent intent = new Intent(ApplicationProvider.getApplicationContext(), AuthenticatorActivity.class);
+        scenario = ActivityScenario.launch(intent);
+    }
+
+    @After
+    public void tearDown() {
+        scenario.close();
+    }
 
     @Rule
     public final TestRule permissionRule = GrantStoragePermissionRule.grant();
 
     @Test
     @ScreenshotTest
     public void login() {
-        AuthenticatorActivity sut = activityRule.launchActivity(null);
-        ((TextView) sut.findViewById(R.id.host_url_input)).setText(URL);
-        sut.runOnUiThread(() -> sut.getAccountSetupBinding().hostUrlInput.clearFocus());
-        screenshot(sut);
+        scenario.onActivity(sut -> {
+            ((TextView) sut.findViewById(R.id.host_url_input)).setText(URL);
+            onIdleSync(() -> {
+                sut.runOnUiThread(() -> sut.getAccountSetupBinding().hostUrlInput.clearFocus());
+                screenshot(sut);
+            });
+        });
     }
 }

app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java

@@ -7,33 +7,42 @@
  */
 package com.nextcloud.client;
 
-import android.app.Activity;
+import android.content.Intent;
 
 import com.nextcloud.test.GrantStoragePermissionRule;
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.ui.activity.CommunityActivity;
 import com.owncloud.android.utils.ScreenshotTest;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
-import androidx.test.espresso.intent.rule.IntentsTestRule;
-
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
 
 public class CommunityActivityIT extends AbstractIT {
-    @Rule public IntentsTestRule<CommunityActivity> activityRule = new IntentsTestRule<>(CommunityActivity.class,
-                                                                                         true,
-                                                                                         false);
+    private ActivityScenario<CommunityActivity> scenario;
+
+    @Before
+    public void setUp() {
+        Intent intent = new Intent(ApplicationProvider.getApplicationContext(), CommunityActivity.class);
+        scenario = ActivityScenario.launch(intent);
+    }
+
+    @After
+    public void tearDown() {
+        scenario.close();
+    }
 
     @Rule
     public final TestRule permissionRule = GrantStoragePermissionRule.grant();
 
     @Test
     @ScreenshotTest
     public void open() {
-        Activity sut = activityRule.launchActivity(null);
-
-        screenshot(sut);
+        scenario.onActivity(sut -> onIdleSync(() -> screenshot(sut)));
     }
 }