From edd33f2685b3afe0d4d92f33bde083f277ae9a33 Mon Sep 17 00:00:00 2001
From: Andrei Joltan <51314259+AndiAJ@users.noreply.github.com>
Date: Tue, 7 Dec 2021 15:54:05 +0200
Subject: [PATCH] [fenix] [UI Smoke Tests] New undoDeleteBookmarkFolderTest UI
 test and Improve coverage for deleteNonEmptyBookmarkFolderTest UI test
 (https://github.com/mozilla-mobile/fenix/pull/22587)

* New undoDeleteBookmarkFolderTest smoke UI test

* Improve coverage for deleteNonEmptyBookmarkFolderTest UI smoke test

Co-authored-by: AndiAJ <andiaj@users.noreply.github.com>
---
 .../org/mozilla/fenix/ui/BookmarksTest.kt     | 26 +++++++++++++++++++
 .../java/org/mozilla/fenix/ui/SmokeTest.kt    | 17 +++++++++++-
 .../mozilla/fenix/ui/robots/BookmarksRobot.kt |  1 +
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 0dd4ce8d5e..a522f27e8b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -627,4 +627,30 @@ class BookmarksTest {
             verifyBookmarkIsDeleted("Test_Page_1")
         }
     }
+
+    @SmokeTest
+    @Test
+    fun undoDeleteBookmarkFolderTest() {
+
+        browserScreen {
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            bookmarksListIdlingResource =
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            createFolder("My Folder")
+            verifyFolderTitle("My Folder")
+            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            cancelFolderDeletion()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            clickUndoDeleteButton()
+            verifyFolderTitle("My Folder")
+        }
+    }
 }
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 727071e55a..f50fd9df7b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -945,6 +945,18 @@ class SmokeTest {
             verifyFolderTitle("My Folder")
             IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
         }.openThreeDotMenu("Test_Page_1") {
+        }.clickEdit {
+            clickParentFolderSelector()
+            selectFolder("My Folder")
+            navigateUp()
+            saveEditBookmark()
+            createFolder("My Folder 2")
+            bookmarksListIdlingResource =
+                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
+            IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
+            verifyFolderTitle("My Folder 2")
+            IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
+        }.openThreeDotMenu("My Folder 2") {
         }.clickEdit {
             clickParentFolderSelector()
             selectFolder("My Folder")
@@ -958,12 +970,15 @@ class SmokeTest {
         }.clickDelete {
             confirmDeletion()
             verifyDeleteSnackBarText()
+            verifyBookmarkIsDeleted("My Folder")
+            verifyBookmarkIsDeleted("My Folder 2")
+            verifyBookmarkIsDeleted("Test_Page_1")
             navigateUp()
         }
 
         browserScreen {
         }.openThreeDotMenu {
-            verifyBookmarksButton()
+            verifyAddBookmarkButton()
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index d66e451ca4..7ba840abea 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -369,6 +369,7 @@ private fun assertBookmarkIsDeleted(expectedTitle: String) {
     assertFalse(
         mDevice.findObject(
             UiSelector()
+                .resourceId("$packageName:id/title")
                 .textContains(expectedTitle)
         ).waitForExists(waitingTime)
     )