From 92886121fe66b91529dec562527b5715df17cf91 Mon Sep 17 00:00:00 2001
From: Oana Horvath <oana.horvath@softvision.ro>
Date: Wed, 26 Aug 2020 16:17:31 +0300
Subject: [PATCH] Closes #13877: shortens closeTabTest to avoid flakiness

---
 .../mozilla/fenix/ui/TabbedBrowsingTest.kt    | 129 +++++++++---------
 1 file changed, 62 insertions(+), 67 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
index 059d47e4f..1aa0857f6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -149,92 +149,87 @@ class TabbedBrowsingTest {
 
     @Test
     fun closeTabTest() {
-        var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer)
-
-        genericURLS.forEachIndexed { index, element ->
-            navigationToolbar {
-            }.openNewTabAndEnterToBrowser(element.url) {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                verifyCloseTabsButton("Test_Page_${index + 1}")
-                closeTabViaXButton("Test_Page_${index + 1}")
-                verifySnackBarText("Tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-            mDevice.waitForIdle()
+        navigationToolbar {
+        }.openNewTabAndEnterToBrowser(genericURL.url) {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            verifyCloseTabsButton("Test_Page_1")
+            closeTabViaXButton("Test_Page_1")
+            verifySnackBarText("Tab closed")
+            snackBarButtonClick("UNDO")
+        }
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                swipeTabRight("Test_Page_${index + 1}")
-                verifySnackBarText("Tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        mDevice.waitForIdle()
 
-            mDevice.waitForIdle()
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            swipeTabRight("Test_Page_1")
+            verifySnackBarText("Tab closed")
+            snackBarButtonClick("UNDO")
+        }
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                swipeTabLeft("Test_Page_${index + 1}")
-                verifySnackBarText("Tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        mDevice.waitForIdle()
 
-            mDevice.waitForIdle()
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            swipeTabLeft("Test_Page_1")
+            verifySnackBarText("Tab closed")
+            snackBarButtonClick("UNDO")
+        }
+
+        mDevice.waitForIdle()
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-            }.openHomeScreen {
-            }
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+        }.openHomeScreen {
         }
     }
 
     @Test
     fun closePrivateTabTest() {
-        var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer)
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         homeScreen { }.togglePrivateBrowsingMode()
-        genericURLS.forEachIndexed { index, element ->
-            navigationToolbar {
-            }.openNewTabAndEnterToBrowser(element.url) {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                verifyCloseTabsButton("Test_Page_${index + 1}")
-                closeTabViaXButton("Test_Page_${index + 1}")
-                verifySnackBarText("Private tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        navigationToolbar {
+        }.openNewTabAndEnterToBrowser(genericURL.url) {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            verifyCloseTabsButton("Test_Page_1")
+            closeTabViaXButton("Test_Page_1")
+            verifySnackBarText("Private tab closed")
+            snackBarButtonClick("UNDO")
+        }
 
-            mDevice.waitForIdle()
+        mDevice.waitForIdle()
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                swipeTabRight("Test_Page_${index + 1}")
-                verifySnackBarText("Private tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            swipeTabRight("Test_Page_1")
+            verifySnackBarText("Private tab closed")
+            snackBarButtonClick("UNDO")
+        }
 
-            mDevice.waitForIdle()
+        mDevice.waitForIdle()
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                swipeTabLeft("Test_Page_${index + 1}")
-                verifySnackBarText("Private tab closed")
-                snackBarButtonClick("UNDO")
-            }
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            swipeTabLeft("Test_Page_1")
+            verifySnackBarText("Private tab closed")
+            snackBarButtonClick("UNDO")
+        }
 
-            mDevice.waitForIdle()
+        mDevice.waitForIdle()
 
-            browserScreen {
-            }.openTabDrawer {
-                verifyExistingOpenTabs("Test_Page_${index + 1}")
-                closeTabViaXButton("Test_Page_${index + 1}")
-            }
+        browserScreen {
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
         }
     }