From f2e74f31f8650600fed4e63922aceda3d44aae81 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 24 Nov 2021 14:45:52 +0200
Subject: [PATCH] [fenix] Improve expand/collapse collection UI test coverage

---
 .../java/org/mozilla/fenix/ui/SmokeTest.kt    | 26 +++++++++++++++++--
 .../fenix/ui/robots/CollectionRobot.kt        | 16 +++++++++---
 2 files changed, 36 insertions(+), 6 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 e50f2696ba..02e2778660 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -843,8 +843,8 @@ class SmokeTest {
             verifyCollectionIcon()
         }.expandCollection(collectionName) {
             verifyTabSavedInCollection(webPage.title)
-            verifyCollectionTabLogo()
-            verifyCollectionTabUrl()
+            verifyCollectionTabLogo(true)
+            verifyCollectionTabUrl(true)
             verifyShareCollectionButtonIsVisible(true)
             verifyCollectionMenuIsVisible(true)
             verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
@@ -854,6 +854,28 @@ class SmokeTest {
             verifyTabSavedInCollection(webPage.title, false)
             verifyShareCollectionButtonIsVisible(false)
             verifyCollectionMenuIsVisible(false)
+            verifyCollectionTabLogo(false)
+            verifyCollectionTabUrl(false)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
+        }
+
+        homeScreen {
+        }.expandCollection(collectionName) {
+            verifyTabSavedInCollection(webPage.title)
+            verifyCollectionTabLogo(true)
+            verifyCollectionTabUrl(true)
+            verifyShareCollectionButtonIsVisible(true)
+            verifyCollectionMenuIsVisible(true)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
+        }.collapseCollection(collectionName) {}
+
+        collectionRobot {
+            verifyTabSavedInCollection(webPage.title, false)
+            verifyShareCollectionButtonIsVisible(false)
+            verifyCollectionMenuIsVisible(false)
+            verifyCollectionTabLogo(false)
+            verifyCollectionTabUrl(false)
+            verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
index b5f881aec8..97fc2c2077 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt
@@ -78,12 +78,20 @@ class CollectionRobot {
                 .check(doesNotExist())
     }
 
-    fun verifyCollectionTabUrl() {
-        onView(withId(R.id.caption)).check(matches(isDisplayed()))
+    fun verifyCollectionTabUrl(visible: Boolean) {
+        onView(withId(R.id.caption))
+            .check(
+                if (visible) matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
+                else doesNotExist()
+            )
     }
 
-    fun verifyCollectionTabLogo() {
-        onView(withId(R.id.favicon)).check(matches(isDisplayed()))
+    fun verifyCollectionTabLogo(visible: Boolean) {
+        onView(withId(R.id.favicon))
+            .check(
+                if (visible) matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
+                else doesNotExist()
+            )
     }
 
     fun verifyShareCollectionButtonIsVisible(visible: Boolean) {