From 5959b0a3094adcf7a7b75f68d7fb776edbeedba3 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 25 Nov 2021 16:28:19 +0200
Subject: [PATCH] [fenix] Refactor recently closed tabs UI smoke tests

---
 .../java/org/mozilla/fenix/ui/SmokeTest.kt    | 10 +++---
 .../ui/robots/RecentlyClosedTabsRobot.kt      | 31 ++++++++-----------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 9825c9e220..6129e3a83d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -681,8 +681,8 @@ class SmokeTest {
     }
 
     @Test
-    // Verifies the Open in a new tab option from the Recently Closed Tabs overflow menu
-    fun openRecentlyClosedTabsInNewTabTest() {
+    // Verifies that a recently closed item is properly opened
+    fun openRecentlyClosedItemTest() {
         val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         homeScreen {
@@ -699,15 +699,13 @@ class SmokeTest {
             IdlingRegistry.getInstance().register(recentlyClosedTabsListIdlingResource!!)
             verifyRecentlyClosedTabsMenuView()
             IdlingRegistry.getInstance().unregister(recentlyClosedTabsListIdlingResource!!)
-        }.clickOpenInNewTab {
+        }.clickRecentlyClosedItem("Test_Page_1") {
             verifyUrl(website.url.toString())
-        }.openTabDrawer {
-            verifyNormalModeSelected()
         }
     }
 
     @Test
-    // Verifies the delete button from the Recently Closed Tabs
+    // Verifies that tapping the "x" button removes a recently closed item from the list
     fun deleteRecentlyClosedTabsItemTest() {
         val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
index d3984227c5..95af570e0d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.ui.robots
 import android.net.Uri
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.Visibility
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -44,8 +43,9 @@ class RecentlyClosedTabsRobot {
     fun clickDeleteRecentlyClosedTabs() = recentlyClosedTabsDeleteButton().click()
 
     class Transition {
-        fun clickOpenInNewTab(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            recentlyClosedTabsPageTitle().click()
+        fun clickRecentlyClosedItem(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            recentlyClosedTabsPageTitle(title).click()
+            mDevice.waitForIdle()
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()
@@ -65,16 +65,16 @@ private fun assertRecentlyClosedTabsMenuView() {
         )
 }
 
-private fun assertEmptyRecentlyClosedTabsList() =
+private fun assertEmptyRecentlyClosedTabsList() {
+    mDevice.waitForIdle()
+
     onView(
         allOf(
             withId(R.id.recently_closed_empty_view),
-            withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
-        )
-    )
-        .check(
-            matches(withText("No recently closed tabs here"))
+            withText(R.string.recently_closed_empty_message)
         )
+    ).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+}
 
 private fun assertPageUrl(expectedUrl: Uri) = onView(
     allOf(
@@ -88,21 +88,16 @@ private fun assertPageUrl(expectedUrl: Uri) = onView(
         matches(withText(Matchers.containsString(expectedUrl.toString())))
     )
 
-private fun recentlyClosedTabsPageTitle() = onView(
+private fun recentlyClosedTabsPageTitle(title: String) = onView(
     allOf(
         withId(R.id.title),
-        withText("Test_Page_1")
+        withText(title)
     )
 )
 
 private fun assertRecentlyClosedTabsPageTitle(title: String) {
-    recentlyClosedTabsPageTitle()
-        .check(
-            matches(withEffectiveVisibility(Visibility.VISIBLE))
-        )
-        .check(
-            matches(withText(title))
-        )
+    recentlyClosedTabsPageTitle(title)
+        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
 private fun recentlyClosedTabsDeleteButton() =