commit ab4335e0195df50ef1f61671e1c85ceb0a6650df parent a06d9f72da59d02bcf8c07ce0369807a085eaa55 Author: Titouan Thibaud <tthibaud@mozilla.com> Date: Tue, 4 Nov 2025 13:44:55 +0000 Bug 1997093 - Simplify TestAssetHelper with MockWebServer extension r=android-reviewers,calu Simplify TestAssetHelper Differential Revision: https://phabricator.services.mozilla.com/D270502 Diffstat:
47 files changed, 603 insertions(+), 664 deletions(-)
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestAssetHelper.kt @@ -29,165 +29,128 @@ object TestAssetHelper { * Content for these pages all follow the same pattern. See [generic1.html] for * content implementation details. */ - fun getGenericAssets(server: MockWebServer): List<TestAsset> { - @Suppress("MagicNumber") - return (1..4).map { - TestAsset( - server.url("pages/generic$it.html").toString().toUri()!!, - "Page content: $it", - "Test_Page_$it", - ) - } - } - - fun getGenericAsset(server: MockWebServer, pageNum: Int): TestAsset { - val url = server.url("pages/generic$pageNum.html").toString().toUri()!! - val content = "Page content: $pageNum" - val title = "Test_Page_$pageNum" - - return TestAsset(url, content, title) - } - - fun getLoremIpsumAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/lorem-ipsum.html").toString().toUri()!! - val content = "Page content: lorem ipsum" - val title = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt" - - return TestAsset(url, content, title) - } - - fun getRefreshAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/refresh.html").toString().toUri()!! - val content = "Page content: refresh" - - return TestAsset(url, content, "") - } - - fun getUUIDPage(server: MockWebServer): TestAsset { - val url = server.url("pages/basic_nav_uuid.html").toString().toUri()!! - val content = "Page content: basic_nav_uuid" - - return TestAsset(url, content, "") - } - - fun getEnhancedTrackingProtectionAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/trackingPage.html").toString().toUri()!! - val content = "Level 1 (Basic) List" - - return TestAsset(url, content, "") - } - - fun getImageAsset(server: MockWebServer): TestAsset { - val url = server.url("resources/rabbit.jpg").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getPdfFormAsset(server: MockWebServer): TestAsset { - val url = server.url("resources/pdfForm.pdf").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getSaveLoginAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/password.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getAddressFormAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/addressForm.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getAppLinksRedirectAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/appLinksLinks.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getCreditCardFormAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/creditCardForm.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getHTMLControlsFormAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/htmlControls.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getExternalLinksAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/externalLinks.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getAudioPageAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/audioMediaPage.html").toString().toUri()!! - val title = "Audio_Test_Page" - val content = "Page content: audio player" - - return TestAsset(url, content, title) - } - - fun getVideoPageAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/videoMediaPage.html").toString().toUri()!! - val title = "Video_Test_Page" - val content = "Page content: video player" - - return TestAsset(url, content, title) - } - - fun getMutedVideoPageAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/mutedVideoPage.html").toString().toUri()!! - val title = "Muted_Video_Test_Page" - val content = "Page content: muted video player" - - return TestAsset(url, content, title) - } - - fun getStorageTestAsset(server: MockWebServer, pageAsset: String): TestAsset { - val url = server.url("pages/$pageAsset").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getGPCTestAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/global_privacy_control.html").toString().toUri()!! - - return TestAsset(url, "", "") - } - - fun getTextFragmentAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/textFragment.html").toString().toUri()!! - val title = "Text_Fragment" - - return TestAsset(url, "", title) - } - - fun getPromptAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/beforeUnload.html").toString().toUri()!! - val title = "BeforeUnload_Test_Page" - - return TestAsset(url, "", title) - } - - fun getFirstForeignWebPageAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/firstForeignWebPage.html").toString().toUri()!! - val title = "Page_de_test_FR_1" - val content = "Article du jour" - - return TestAsset(url, content, title) - } - - fun getSecondForeignWebPageAsset(server: MockWebServer): TestAsset { - val url = server.url("pages/secondForeignWebPage.html").toString().toUri()!! - val title = "Page_de_test_FR_2" - val content = "Mot du jour" - - return TestAsset(url, content, title) - } + @Suppress("MagicNumber") + val MockWebServer.genericAssets + get() = (1..4).map { getGenericAsset(it) } + + fun MockWebServer.getGenericAsset(pageNum: Int) = createTestAsset( + path = "pages/generic$pageNum.html", + content = "Page content: $pageNum", + title = "Test_Page_$pageNum", + ) + + val MockWebServer.loremIpsumAsset + get() = createTestAsset( + path = "pages/lorem-ipsum.html", + content = "Page content: lorem ipsum", + title = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt", + ) + + val MockWebServer.refreshAsset + get() = createTestAsset( + path = "pages/refresh.html", + content = "Page content: refresh", + ) + + val MockWebServer.uuidPage + get() = createTestAsset( + path = "pages/basic_nav_uuid.html", + content = "Page content: basic_nav_uuid", + ) + + val MockWebServer.enhancedTrackingProtectionAsset + get() = createTestAsset( + path = "pages/trackingPage.html", + content = "Level 1 (Basic) List", + ) + + val MockWebServer.imageAsset + get() = createTestAsset("resources/rabbit.jpg") + + val MockWebServer.pdfFormAsset + get() = createTestAsset("resources/pdfForm.pdf") + + val MockWebServer.saveLoginAsset + get() = createTestAsset("pages/password.html") + + val MockWebServer.addressFormAsset + get() = createTestAsset("pages/addressForm.html") + + val MockWebServer.appLinksRedirectAsset + get() = createTestAsset("pages/appLinksLinks.html") + + val MockWebServer.creditCardFormAsset + get() = createTestAsset("pages/creditCardForm.html") + + val MockWebServer.htmlControlsFormAsset + get() = createTestAsset("pages/htmlControls.html") + + val MockWebServer.externalLinksAsset + get() = createTestAsset("pages/externalLinks.html") + + val MockWebServer.audioPageAsset + get() = createTestAsset( + path = "pages/audioMediaPage.html", + title = "Audio_Test_Page", + content = "Page content: audio player", + ) + + val MockWebServer.videoPageAsset + get() = createTestAsset( + path = "pages/videoMediaPage.html", + title = "Video_Test_Page", + content = "Page content: video player", + ) + + val MockWebServer.mutedVideoPageAsset + get() = createTestAsset( + path = "pages/mutedVideoPage.html", + title = "Muted_Video_Test_Page", + content = "Page content: muted video player", + ) + + val MockWebServer.gcpTestAsset + get() = createTestAsset("pages/global_privacy_control.html") + + val MockWebServer.textFragmentAsset + get() = createTestAsset( + path = "pages/textFragment.html", + title = "Text_Fragment", + ) + + val MockWebServer.promptAsset + get() = createTestAsset( + path = "pages/beforeUnload.html", + title = "BeforeUnload_Test_Page", + ) + + val MockWebServer.firstForeignWebPageAsset + get() = createTestAsset( + path = "pages/firstForeignWebPage.html", + title = "Page_de_test_FR_1", + content = "Article du jour", + ) + + val MockWebServer.secondForeignWebPageAsset + get() = createTestAsset( + path = "pages/secondForeignWebPage.html", + title = "Page_de_test_FR_2", + content = "Mot du jour", + ) + + val MockWebServer.storageCheckPageAsset + get() = createTestAsset("pages/storage_check.html") + + val MockWebServer.storageWritePageAsset + get() = createTestAsset("pages/storage_write.html") + + private fun MockWebServer.createTestAsset( + path: String, + content: String = "", + title: String = "", + ) = TestAsset( + url(path).toString().toUri(), + content, + title, + ) } diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt @@ -11,7 +11,7 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.addressFormAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.packageName import org.mozilla.fenix.helpers.TestSetup @@ -61,8 +61,7 @@ class AddressAutofillTest : TestSetup() { @SmokeTest @Test fun verifyAddressAutofillTest() { - val addressFormPage = - TestAssetHelper.getAddressFormAsset(mockWebServer) + val addressFormPage = mockWebServer.addressFormAsset autofillScreen(composeTestRule) { fillAndSaveAddress( @@ -164,8 +163,7 @@ class AddressAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1836839 @Test fun verifyAddressAutofillToggleTest() { - val addressFormPage = - TestAssetHelper.getAddressFormAsset(mockWebServer) + val addressFormPage = mockWebServer.addressFormAsset autofillScreen(composeTestRule) { fillAndSaveAddress( @@ -208,8 +206,7 @@ class AddressAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1836847 @Test fun verifyManageAddressesPromptOptionTest() { - val addressFormPage = - TestAssetHelper.getAddressFormAsset(mockWebServer) + val addressFormPage = mockWebServer.addressFormAsset autofillScreen(composeTestRule) { fillAndSaveAddress( @@ -243,8 +240,7 @@ class AddressAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1836849 @Test fun verifyMultipleAddressesSelectionTest() { - val addressFormPage = - TestAssetHelper.getAddressFormAsset(mockWebServer) + val addressFormPage = mockWebServer.addressFormAsset autofillScreen(composeTestRule) { fillAndSaveAddress( @@ -358,8 +354,7 @@ class AddressAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1836858 @Test fun verifyFormFieldCanBeFilledManuallyTest() { - val addressFormPage = - TestAssetHelper.getAddressFormAsset(mockWebServer) + val addressFormPage = mockWebServer.addressFormAsset autofillScreen(composeTestRule) { fillAndSaveAddress( diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/AppLinksTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/AppLinksTest.kt @@ -15,6 +15,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.OpenLinksInApp import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.appLinksRedirectAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -44,7 +45,7 @@ class AppLinksTest : TestSetup() { @Before override fun setUp() { super.setUp() - externalLinksPage = TestAssetHelper.getAppLinksRedirectAsset(mockWebServer) + externalLinksPage = mockWebServer.appLinksRedirectAsset } @Test diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt @@ -14,7 +14,9 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem import org.mozilla.fenix.helpers.MockBrowserDataHelper.generateBookmarkFolder -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.genericAssets +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText @@ -50,7 +52,7 @@ class BookmarksTest : TestSetup() { @SmokeTest @Test fun deleteBookmarkFoldersTest() { - val website = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) createBookmarkItem(website.url.toString(), website.title, null) @@ -91,7 +93,7 @@ class BookmarksTest : TestSetup() { @SmokeTest @Test fun editBookmarksNameAndUrlTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -120,7 +122,7 @@ class BookmarksTest : TestSetup() { @SmokeTest @Test fun shareBookmarkTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -144,8 +146,8 @@ class BookmarksTest : TestSetup() { @Test fun openMultipleSelectedBookmarksInANewTabTest() { val webPages = listOf( - TestAssetHelper.getGenericAsset(mockWebServer, 1), - TestAssetHelper.getGenericAsset(mockWebServer, 2), + mockWebServer.getGenericAsset(1), + mockWebServer.getGenericAsset(2), ) createBookmarkItem(webPages[0].url.toString(), webPages[0].title, null) @@ -174,8 +176,8 @@ class BookmarksTest : TestSetup() { @Test fun deleteMultipleSelectedBookmarksTest() { val webPages = listOf( - TestAssetHelper.getGenericAsset(mockWebServer, 1), - TestAssetHelper.getGenericAsset(mockWebServer, 2), + mockWebServer.getGenericAsset(1), + mockWebServer.getGenericAsset(2), ) createBookmarkItem(webPages[0].url.toString(), webPages[0].title, null) @@ -219,8 +221,8 @@ class BookmarksTest : TestSetup() { @SmokeTest @Test fun verifySearchForBookmarkedItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.htmlControlsFormAsset val newFolder = generateBookmarkFolder(title = bookmarkFolderName, position = null) createBookmarkItem(firstWebPage.url.toString(), firstWebPage.title, null, newFolder) @@ -244,7 +246,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833710 @Test fun verifySearchBookmarksViewTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -286,7 +288,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833685 @Test fun verifyAddBookmarkButtonTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -306,7 +308,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833686 @Test fun createBookmarkFolderTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -336,7 +338,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833694 @Test fun copyBookmarkURLTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -356,7 +358,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833695 @Test fun openBookmarkInNewTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -379,7 +381,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833696 @Test fun openBookmarkInPrivateTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -396,7 +398,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833697 @Test fun deleteBookmarkTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) createBookmarkItem(defaultWebPage.url.toString(), defaultWebPage.title, null) @@ -417,12 +419,7 @@ class BookmarksTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833706 @Test fun verifyOpenAllInNewTabsOptionTest() { - val webPages = listOf( - TestAssetHelper.getGenericAsset(mockWebServer, 1), - TestAssetHelper.getGenericAsset(mockWebServer, 2), - TestAssetHelper.getGenericAsset(mockWebServer, 3), - TestAssetHelper.getGenericAsset(mockWebServer, 4), - ) + val webPages = mockWebServer.genericAssets val rootFolderGuid = generateBookmarkFolder(title = "root", position = null) val subFolderGuid = generateBookmarkFolder(rootFolderGuid, "sub", null) @@ -453,8 +450,8 @@ class BookmarksTest : TestSetup() { @SkipLeaks fun verifyOpenAllInPrivateTabsTest() { val webPages = listOf( - TestAssetHelper.getGenericAsset(mockWebServer, 1), - TestAssetHelper.getGenericAsset(mockWebServer, 2), + mockWebServer.getGenericAsset(1), + mockWebServer.getGenericAsset(2), ) val rootFolderGuid = generateBookmarkFolder(title = "root", position = null) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt @@ -100,7 +100,7 @@ class BrowsingErrorPagesTest : TestSetup() { // This tests the server ERROR_CONNECTION_REFUSED @Test fun verifyConnectionInterruptedErrorMessageTest() { - val testUrl = getGenericAsset(mockWebServer, 1) + val testUrl = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testUrl.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt @@ -52,8 +52,8 @@ class CollectionTest : TestSetup() { @SmokeTest @Test fun createFirstCollectionUsingHomeScreenButtonTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -85,7 +85,7 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2283299 @Test fun createFirstCollectionFromMainMenuTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -101,8 +101,8 @@ class CollectionTest : TestSetup() { @SmokeTest @Test fun verifyExpandedCollectionItemsTest() { - val webPage = getGenericAsset(mockWebServer, 1) - val webPage2 = getGenericAsset(mockWebServer, 2) + val webPage = mockWebServer.getGenericAsset(1) + val webPage2 = mockWebServer.getGenericAsset(2) val webPageUrl = webPage.url.host.toString() MockBrowserDataHelper @@ -153,8 +153,8 @@ class CollectionTest : TestSetup() { @SmokeTest @Test fun openAllTabsFromACollectionTest() { - val firstTestPage = getGenericAsset(mockWebServer, 1) - val secondTestPage = getGenericAsset(mockWebServer, 2) + val firstTestPage = mockWebServer.getGenericAsset(1) + val secondTestPage = mockWebServer.getGenericAsset(2) MockBrowserDataHelper .createCollection( @@ -178,8 +178,8 @@ class CollectionTest : TestSetup() { @SmokeTest @Test fun shareAllTabsFromACollectionTest() { - val firstWebsite = getGenericAsset(mockWebServer, 1) - val secondWebsite = getGenericAsset(mockWebServer, 2) + val firstWebsite = mockWebServer.getGenericAsset(1) + val secondWebsite = mockWebServer.getGenericAsset(2) val sharingApp = "Gmail" val urlString = "${secondWebsite.url}\n\n${firstWebsite.url}" @@ -205,7 +205,7 @@ class CollectionTest : TestSetup() { @SmokeTest @Test fun deleteCollectionTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper .createCollection( @@ -228,8 +228,8 @@ class CollectionTest : TestSetup() { // open a webpage, and add currently opened tab to existing collection @Test fun saveTabToExistingCollectionFromMainMenuTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) MockBrowserDataHelper .createCollection( @@ -255,8 +255,8 @@ class CollectionTest : TestSetup() { // Testrail link: https://mozilla.testrail.io/index.php?/cases/view/343423 @Test fun saveTabToExistingCollectionUsingTheAddTabButtonTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) MockBrowserDataHelper .createCollection( @@ -281,7 +281,7 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/343424 @Test fun renameCollectionTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper .createCollection( @@ -304,8 +304,8 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/991248 @Test fun createCollectionUsingSelectTabsButtonTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -328,7 +328,7 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2319455 @Test fun removeTabFromCollectionUsingTheCloseButtonTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper .createCollection( @@ -350,8 +350,8 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/343427 @Test fun removeTabFromCollectionUsingSwipeLeftActionTest() { - val testPage1 = getGenericAsset(mockWebServer, 1) - val testPage2 = getGenericAsset(mockWebServer, 2) + val testPage1 = mockWebServer.getGenericAsset(1) + val testPage2 = mockWebServer.getGenericAsset(2) MockBrowserDataHelper .createCollection( @@ -373,8 +373,8 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/991278 @Test fun removeTabFromCollectionUsingSwipeRightActionTest() { - val testPage1 = getGenericAsset(mockWebServer, 1) - val testPage2 = getGenericAsset(mockWebServer, 2) + val testPage1 = mockWebServer.getGenericAsset(1) + val testPage2 = mockWebServer.getGenericAsset(2) MockBrowserDataHelper .createCollection( @@ -396,7 +396,7 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080080 @Test fun removeLastTabFromCollectionUsingSwipeActionTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper .createCollection( @@ -419,8 +419,8 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/991276 @Test fun createCollectionByLongPressingOpenTabsTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -454,7 +454,7 @@ class CollectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/344897 @Test fun navigateBackInCollectionFlowTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(webPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt @@ -15,7 +15,9 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.MatcherHelper.itemWithText import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.externalLinksAsset +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.imageAsset import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText @@ -64,10 +66,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243837 @Test fun verifyOpenLinkNewTabContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 1) + val pageLinks = mockWebServer.getGenericAsset(4) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -88,10 +88,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/244655 @Test fun verifyOpenLinkInNewPrivateTabContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 2) + val pageLinks = mockWebServer.getGenericAsset(4) + val genericURL = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -111,10 +109,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243832 @Test fun verifyCopyLinkContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + val pageLinks = mockWebServer.getGenericAsset(4) + val genericURL = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -132,10 +128,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243838 @Test fun verifyShareLinkContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 1) + val pageLinks = mockWebServer.getGenericAsset(4) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -153,10 +147,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243833 @Test fun verifyOpenImageNewTabContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val imageResource = - TestAssetHelper.getImageAsset(mockWebServer) + val pageLinks = mockWebServer.getGenericAsset(4) + val imageResource = mockWebServer.imageAsset navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -173,10 +165,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243834 @Test fun verifyCopyImageLocationContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val imageResource = - TestAssetHelper.getImageAsset(mockWebServer) + val pageLinks = mockWebServer.getGenericAsset(4) + val imageResource = mockWebServer.imageAsset navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -194,10 +184,8 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243835 @Test fun verifySaveImageContextMenuOptionTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val imageResource = - TestAssetHelper.getImageAsset(mockWebServer) + val pageLinks = mockWebServer.getGenericAsset(4) + val imageResource = mockWebServer.imageAsset navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -217,12 +205,9 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/352050 @Test fun verifyContextMenuLinkVariationsTest() { - val pageLinks = - TestAssetHelper.getGenericAsset(mockWebServer, 4) - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 1) - val imageResource = - TestAssetHelper.getImageAsset(mockWebServer) + val pageLinks = mockWebServer.getGenericAsset(4) + val genericURL = mockWebServer.getGenericAsset(1) + val imageResource = mockWebServer.imageAsset navigationToolbar { }.enterURLAndEnterToBrowser(pageLinks.url) { @@ -241,8 +226,7 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2333840 @Test fun verifyPDFContextMenuLinkVariationsTest() { - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -263,7 +247,7 @@ class ContextMenusTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/832094 @Test fun verifyOpenLinkInAppContextMenuOptionTest() { - val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + val defaultWebPage = mockWebServer.externalLinksAsset navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt @@ -10,7 +10,7 @@ import org.junit.Test import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.packageName import org.mozilla.fenix.helpers.TestSetup @@ -46,7 +46,7 @@ class CrashReportingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2336134 @Test fun restoreTabFromTabCrashedReporterTest() { - val website = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) homeScreen { }.openNavigationToolbar { @@ -63,8 +63,8 @@ class CrashReportingTest : TestSetup() { @SmokeTest @Test fun useAppWhileTabIsCrashedTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) homeScreen { }.openNavigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt @@ -14,7 +14,7 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.putAppToBackground import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.creditCardFormAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.packageName import org.mozilla.fenix.helpers.TestSetup @@ -56,7 +56,7 @@ class CreditCardAutofillTest : TestSetup() { @SmokeTest @Test fun verifyCreditCardAutofillTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -171,7 +171,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1859917 @Test fun verifyManageCreditCardsPromptOptionTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -201,7 +201,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1512790 @Test fun verifyCreditCardsAutofillToggleTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -278,7 +278,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1512796 @Test fun verifyEditedCardIsSavedTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -362,7 +362,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1512794 @Test fun verifyMultipleCreditCardsCanBeAddedTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -418,7 +418,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2271304 @Test fun verifyDoNotSaveCreditCardFromPromptTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(creditCardFormPage.url) { @@ -439,7 +439,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1779194 @Test fun verifySaveCreditCardFromPromptTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(creditCardFormPage.url) { @@ -466,7 +466,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2271305 @Test fun verifyCancelCreditCardUpdatePromptTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { @@ -517,7 +517,7 @@ class CreditCardAutofillTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1779195 @Test fun verifyConfirmCreditCardUpdatePromptTest() { - val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer) + val creditCardFormPage = mockWebServer.creditCardFormAsset homeScreen { }.openThreeDotMenu { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt @@ -17,7 +17,8 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.MatcherHelper.itemWithText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.pdfFormAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.mDevice @@ -93,7 +94,7 @@ class CustomTabsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2334762 @Test fun copyCustomTabToolbarUrlTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -156,7 +157,7 @@ class CustomTabsTest : TestSetup() { @SmokeTest @Test fun verifyCustomTabMenuItemsTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -184,7 +185,7 @@ class CustomTabsTest : TestSetup() { @SmokeTest @Test fun openCustomTabInFirefoxTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -203,7 +204,7 @@ class CustomTabsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2239548 @Test fun shareCustomTabUsingToolbarButtonTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -220,7 +221,7 @@ class CustomTabsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/249643 @Test fun verifyCustomTabViewItemsTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -247,8 +248,8 @@ class CustomTabsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2239544 @Test fun verifyPDFViewerInACustomTabTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 3) - val pdfFormResource = TestAssetHelper.getPdfFormAsset(mockWebServer) + val customTabPage = mockWebServer.getGenericAsset(3) + val pdfFormResource = mockWebServer.pdfFormAsset intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -277,7 +278,7 @@ class CustomTabsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2239117 @Test fun verifyCustomTabETPSheetAndToggleTest() { - val customTabPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt @@ -23,7 +23,7 @@ import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_DOCS import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.MatcherHelper.itemWithText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText @@ -351,8 +351,7 @@ class DownloadTest : TestSetup() { @SmokeTest @Test fun saveAsPdfFunctionalityTest() { - val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) downloadFile = "pdfForm.pdf" navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt @@ -14,7 +14,7 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper.getEnhancedTrackingProtectionAsset +import org.mozilla.fenix.helpers.TestAssetHelper.enhancedTrackingProtectionAsset import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper.appContext @@ -93,7 +93,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1514599 @Test fun verifyETPStateIsReflectedInTPSheetTest() { - val genericPage = getGenericAsset(mockWebServer, 1) + val genericPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu { @@ -130,7 +130,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { @SmokeTest @Test fun disablingETPOnAWebsiteAddsItToExceptionListTest() { - val firstPage = getGenericAsset(mockWebServer, 1) + val firstPage = mockWebServer.getGenericAsset(1) val secondPage = "https://mozilla-mobile.github.io/testapp" navigationToolbar { @@ -160,7 +160,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339714 @Test fun enablingETPOnAWebsiteRemovesItFromTheExceptionListTest() { - val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val trackingPage = mockWebServer.enhancedTrackingProtectionAsset navigationToolbar { }.enterURLAndEnterToBrowser(trackingPage.url) { @@ -195,7 +195,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { // Tests removing TP exceptions individually or all at once @Test fun clearWebsitesFromTPExceptionListTest() { - val firstPage = getGenericAsset(mockWebServer, 1) + val firstPage = mockWebServer.getGenericAsset(1) val secondPage = "https://mozilla-mobile.github.io/testapp" navigationToolbar { @@ -232,8 +232,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/417444 @Test fun verifyTrackersBlockedWithStandardTPTest() { - val genericPage = getGenericAsset(mockWebServer, 1) - val trackingProtectionTest = getEnhancedTrackingProtectionAsset(mockWebServer).url + val genericPage = mockWebServer.getGenericAsset(1) + val trackingProtectionTest = mockWebServer.enhancedTrackingProtectionAsset.url homeScreen { }.openThreeDotMenu { @@ -278,8 +278,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { @Test fun verifyTrackersBlockedWithStrictTPTest() { appContext.settings().setStrictETP() - val genericPage = getGenericAsset(mockWebServer, 1) - val trackingProtectionTest = getEnhancedTrackingProtectionAsset(mockWebServer).url + val genericPage = mockWebServer.getGenericAsset(1) + val trackingProtectionTest = mockWebServer.enhancedTrackingProtectionAsset.url homeScreen { }.openThreeDotMenu { @@ -323,8 +323,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { @SmokeTest @Test fun verifyTrackersBlockedWithCustomTPTest() { - val genericWebPage = getGenericAsset(mockWebServer, 1) - val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val genericWebPage = mockWebServer.getGenericAsset(1) + val trackingPage = mockWebServer.enhancedTrackingProtectionAsset homeScreen { }.openThreeDotMenu { @@ -367,8 +367,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { // - Fingerprinters, cryptominers and redirect trackers checked @Test fun customizedTrackingProtectionOptionsTest() { - val genericWebPage = getGenericAsset(mockWebServer, 1) - val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val genericWebPage = mockWebServer.getGenericAsset(1) + val trackingPage = mockWebServer.enhancedTrackingProtectionAsset homeScreen { }.openThreeDotMenu { @@ -407,8 +407,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/562709 @Test fun verifyTrackersBlockedWithCustomTPOptionsDisabledTest() { - val genericWebPage = getGenericAsset(mockWebServer, 1) - val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val genericWebPage = mockWebServer.getGenericAsset(1) + val trackingPage = mockWebServer.enhancedTrackingProtectionAsset homeScreen { }.openThreeDotMenu { @@ -441,8 +441,8 @@ class EnhancedTrackingProtectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2106997 @Test fun verifyTrackingContentBlockedOnlyInPrivateTabsTest() { - val genericWebPage = getGenericAsset(mockWebServer, 1) - val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val genericWebPage = mockWebServer.getGenericAsset(1) + val trackingPage = mockWebServer.enhancedTrackingProtectionAsset homeScreen { }.openThreeDotMenu { @@ -500,7 +500,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { @Test fun blockCookiesStorageAccessTest() { // With Standard TrackingProtection settings - val genericWebPage = getGenericAsset(mockWebServer, 1) + val genericWebPage = mockWebServer.getGenericAsset(1) val testPage = mockWebServer.url("pages/cross-site-cookies.html").toString().toUri() val originHost = "mozilla-mobile.github.io" val currentHost = "localhost" @@ -523,7 +523,7 @@ class EnhancedTrackingProtectionTest : TestSetup() { @Test fun allowCookiesStorageAccessTest() { // With Standard TrackingProtection settings - val genericWebPage = getGenericAsset(mockWebServer, 1) + val genericWebPage = mockWebServer.getGenericAsset(1) val testPage = mockWebServer.url("pages/cross-site-cookies.html").toString().toUri() val originHost = "mozilla-mobile.github.io" val currentHost = "localhost" diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/GlobalPrivacyControlTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/GlobalPrivacyControlTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.TestAssetHelper.TestAsset -import org.mozilla.fenix.helpers.TestAssetHelper.getGPCTestAsset +import org.mozilla.fenix.helpers.TestAssetHelper.gcpTestAsset import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule import org.mozilla.fenix.ui.robots.homeScreen @@ -37,7 +37,7 @@ class GlobalPrivacyControlTest : TestSetup() { @Before override fun setUp() { super.setUp() - gpcPage = getGPCTestAsset(mockWebServer) + gpcPage = mockWebServer.gcpTestAsset } // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2429327 diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt @@ -15,7 +15,8 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.RecyclerViewIdlingResource -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem import org.mozilla.fenix.helpers.TestHelper.mDevice @@ -64,7 +65,7 @@ class HistoryTest : TestSetup() { @SmokeTest @Test fun verifyHistoryMenuWithHistoryItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -87,7 +88,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243288 @Test fun deleteHistoryItemTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -112,7 +113,7 @@ class HistoryTest : TestSetup() { @SmokeTest @Test fun deleteAllHistoryTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -136,7 +137,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339690 @Test fun historyMultiSelectionToolbarItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -164,7 +165,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339696 @Test fun openMultipleSelectedHistoryItemsInANewTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -194,7 +195,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/346098 @Test fun openMultipleSelectedHistoryItemsInPrivateTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -220,8 +221,8 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/346099 @Test fun deleteMultipleSelectedHistoryItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -255,7 +256,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/339701 @Test fun shareMultipleSelectedHistoryItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -282,7 +283,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1715627 @Test fun verifySearchHistoryViewTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -339,8 +340,8 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1715632 @Test fun verifySearchForHistoryItemsTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -365,9 +366,9 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1715634 @Test fun verifyDeletedHistoryItemsCanNotBeSearchedTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) - val thirdWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) + val thirdWebPage = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -411,7 +412,7 @@ class HistoryTest : TestSetup() { @SmokeTest @Test fun noHistoryInPrivateBrowsingTest() { - val website = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) homeScreen { }.togglePrivateBrowsingMode() @@ -429,7 +430,7 @@ class HistoryTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243287 @Test fun openHistoryItemTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt @@ -11,7 +11,7 @@ import org.junit.Test import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -83,8 +83,8 @@ class HomeScreenTest : TestSetup() { it.isPocketEnabled = false } - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 4) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val firstWebPage = mockWebServer.getGenericAsset(4) + val secondWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt @@ -17,7 +17,7 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId import org.mozilla.fenix.helpers.MatcherHelper.itemWithText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.saveLoginAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper import org.mozilla.fenix.helpers.TestHelper.exitMenu @@ -115,8 +115,7 @@ class LoginsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/523839 @Test fun saveLoginFromPromptTest() { - val saveLoginTest = - TestAssetHelper.getSaveLoginAsset(mockWebServer) + val saveLoginTest = mockWebServer.saveLoginAsset homeScreen { }.openThreeDotMenu { @@ -182,7 +181,7 @@ class LoginsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/517817 @Test fun neverSaveLoginFromPromptTest() { - val saveLoginTest = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val saveLoginTest = mockWebServer.saveLoginAsset navigationToolbar { }.enterURLAndEnterToBrowser(saveLoginTest.url) { @@ -212,8 +211,7 @@ class LoginsTest : TestSetup() { @Test @SkipLeaks fun verifyUpdatedLoginIsSavedTest() { - val saveLoginTest = - TestAssetHelper.getSaveLoginAsset(mockWebServer) + val saveLoginTest = mockWebServer.saveLoginAsset navigationToolbar { }.enterURLAndEnterToBrowser(saveLoginTest.url) { @@ -461,7 +459,7 @@ class LoginsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/876532 @Test fun verifyDeleteLoginButtonTest() { - val loginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val loginPage = mockWebServer.saveLoginAsset navigationToolbar { }.enterURLAndEnterToBrowser(loginPage.url) { @@ -494,7 +492,7 @@ class LoginsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1935209"]) fun verifyNeverSaveLoginOptionTest() { - val loginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val loginPage = mockWebServer.saveLoginAsset homeScreen { }.openThreeDotMenu { @@ -602,7 +600,7 @@ class LoginsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1935209"]) fun searchLoginsByUsernameTest() { - val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val firstLoginPage = mockWebServer.saveLoginAsset val secondLoginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html" val originWebsite = "mozilla-mobile.github.io" @@ -648,7 +646,7 @@ class LoginsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1935209"]) fun searchLoginsByUrlTest() { - val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val firstLoginPage = mockWebServer.saveLoginAsset val secondLoginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html" val originWebsite = "mozilla-mobile.github.io" @@ -693,7 +691,7 @@ class LoginsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2266441 @Test fun verifyLastUsedLoginSortingOptionTest() { - val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val firstLoginPage = mockWebServer.saveLoginAsset val secondLoginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html" val originWebsite = "mozilla-mobile.github.io" @@ -740,7 +738,7 @@ class LoginsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2266442 @Test fun verifyAlphabeticalLoginSortingOptionTest() { - val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val firstLoginPage = mockWebServer.saveLoginAsset val secondLoginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html" val originWebsite = "mozilla-mobile.github.io" @@ -826,7 +824,7 @@ class LoginsTest : TestSetup() { @Test @SdkSuppress(maxSdkVersion = 32) fun verifyCopyLoginCredentialsToClipboardTest() { - val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer) + val firstLoginPage = mockWebServer.saveLoginAsset navigationToolbar { }.enterURLAndEnterToBrowser(firstLoginPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt @@ -16,7 +16,8 @@ import org.mozilla.fenix.helpers.Constants.PackageName.PRINT_SPOOLER import org.mozilla.fenix.helpers.DataGenerationHelper.generateRandomString import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.refreshAsset import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.closeApp import org.mozilla.fenix.helpers.TestHelper.exitMenu @@ -53,7 +54,7 @@ class MainMenuTest : TestSetup() { ) } - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -114,7 +115,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2284134 @Test fun openNewTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -146,7 +147,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2284323 @Test fun openSignInTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -160,7 +161,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/243840 @Test fun findInPageTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3) + val defaultWebPage = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -196,7 +197,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2283303 @Test fun switchDesktopSiteModeOnOffTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -213,7 +214,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1314137 @Test fun setDesktopSiteBeforePageLoadTest() { - val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4) + val webPage = mockWebServer.getGenericAsset(4) navigationToolbar { }.enterURLAndEnterToBrowser(webPage.url) { @@ -244,7 +245,7 @@ class MainMenuTest : TestSetup() { @SmokeTest @Test fun addPageShortcutToHomeScreenTest() { - val website = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) val shortcutTitle = generateRandomString(5) homeScreen { @@ -274,7 +275,7 @@ class MainMenuTest : TestSetup() { @SmokeTest @Test fun mainMenuShareButtonTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -287,8 +288,8 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/233604 @Test fun navigateBackAndForwardTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val defaultWebPage = mockWebServer.getGenericAsset(1) + val nextWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -310,7 +311,7 @@ class MainMenuTest : TestSetup() { @SmokeTest @Test fun refreshPageButtonTest() { - val refreshWebPage = TestAssetHelper.getRefreshAsset(mockWebServer) + val refreshWebPage = mockWebServer.refreshAsset navigationToolbar { }.enterURLAndEnterToBrowser(refreshWebPage.url) { @@ -325,7 +326,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2265657 @Test fun forceRefreshPageTest() { - val refreshWebPage = TestAssetHelper.getRefreshAsset(mockWebServer) + val refreshWebPage = mockWebServer.refreshAsset navigationToolbar { }.enterURLAndEnterToBrowser(refreshWebPage.url) { @@ -340,7 +341,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2282411 @Test fun printWebPageFromMainMenuTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -354,7 +355,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2282408 @Test fun printWebPageFromShareMenuTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -369,7 +370,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937924 @Test fun verifyTheWhatIsBrokenErrorMessageTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -388,7 +389,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937926 @Test fun verifyThatTheBrokenSiteFormCanBeCanceledTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -407,7 +408,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937927 @Test fun verifyTheBrokenSiteFormSubmissionTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -431,7 +432,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937930 @Test fun verifyThatTheBrokenSiteFormInfoPersistsTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -451,8 +452,8 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937931 @Test fun verifyTheBrokenSiteFormIsEmptyWithoutSubmittingThePreviousOneTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -476,7 +477,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937932 @Test fun verifyThatTheBrokenSiteFormInfoIsErasedWhenKillingTheAppTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -501,7 +502,7 @@ class MainMenuTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2937933 @Test fun verifyReportBrokenSiteFormNotDisplayedWhenTelemetryIsDisabledTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTestCompose.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTestCompose.kt @@ -22,16 +22,16 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.clickSystemHomeScreenShortcu import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_DOCS import org.mozilla.fenix.helpers.Constants.PackageName.PRINT_SPOOLER import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent -import org.mozilla.fenix.helpers.DataGenerationHelper.getRecommendedExtensionTitle import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.MockBrowserDataHelper -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.firstForeignWebPageAsset import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset -import org.mozilla.fenix.helpers.TestAssetHelper.getPdfFormAsset +import org.mozilla.fenix.helpers.TestAssetHelper.pdfFormAsset +import org.mozilla.fenix.helpers.TestAssetHelper.refreshAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeVeryShort @@ -86,7 +86,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheWebpageRedesignedMenuItemsTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -99,7 +99,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifySwitchToDesktopSiteIsDisabledOnPDFsTest() { - val pdfPage = TestAssetHelper.getPdfFormAsset(mockWebServer) + val pdfPage = mockWebServer.pdfFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(pdfPage.url) { @@ -114,7 +114,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheFindInPageMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 3) + val testPage = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -149,7 +149,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheHistoryMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -165,7 +165,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheDownloadsMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -182,7 +182,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyThePasswordsMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -204,7 +204,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheCustomTabsMainMenuItemsTest() { val customMenuItem = "TestMenuItem" - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -225,7 +225,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyOpenInFirefoxMainMenuTest() { - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -246,7 +246,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyRecommendedExtensionsListWhileNoExtensionIsInstalledTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -263,7 +263,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheExtensionsMenuListAfterRemovingAnExtensionTest() { var recommendedExtensionTitle = "" - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -301,7 +301,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheManageExtensionsItemTest() { var recommendedExtensionTitle = "" - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -335,7 +335,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheBookmarkPageMenuOptionTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -359,7 +359,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheAddToShortcutsSubMenuOptionTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -384,7 +384,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheAddToHomeScreenSubMenuOptionTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -409,8 +409,8 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheSaveToCollectionSubMenuOptionTest() { val collectionTitle = "First Collection" - val firstTestPage = getGenericAsset(mockWebServer, 1) - val secondTestPage = getGenericAsset(mockWebServer, 2) + val firstTestPage = mockWebServer.getGenericAsset(1) + val secondTestPage = mockWebServer.getGenericAsset(2) composeTestRule.activityRule.applySettingsExceptions { // Disabling these features to have better visibility of the Collections view @@ -443,7 +443,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheSaveAsPDFSubMenuOptionTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -461,7 +461,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheTranslatePageSubMenuOptionTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -486,7 +486,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheShareButtonTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -523,7 +523,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyDesktopSiteModeOnOffIsEnabledTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -549,7 +549,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyThePrintSubMenuOptionTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -566,7 +566,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheExtensionInstallationTest() { var recommendedExtensionTitle = "" - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -608,7 +608,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080121 @Test fun verifyTheBrowserViewMainMenuCFRTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) composeTestRule.activityRule.applySettingsExceptions { it.isMenuRedesignCFREnabled = true @@ -623,7 +623,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080898 @Test fun verifyTheFindInPageOptionInPDFsTest() { - val testPage = getGenericAsset(mockWebServer, 3) + val testPage = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -654,7 +654,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080145 @Test fun verifyTheQuitFirefoxMenuItemTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu(composeTestRule) { @@ -681,7 +681,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080103 @Test fun verifyTheDesktopSiteMenuItemInACustomTabTest() { - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -706,7 +706,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheFindInPageMenuItemInACustomTabTest() { - val customTabPage = getGenericAsset(mockWebServer, 3) + val customTabPage = mockWebServer.getGenericAsset(3) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -745,7 +745,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheClosingBehaviourWhenTappingOutsideTheCustomTabMainMenuTest() { val customMenuItem = "TestMenuItem" - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -771,7 +771,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheExtensionMenuListWhileExtensionsAreDisabledTest() { var recommendedExtensionTitle = "" - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -805,7 +805,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080153 @Test fun verifyTheDiscoverMoreExtensionsSubMenuItemTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -822,7 +822,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheReportBrokenSiteSubMenuOptionTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -839,7 +839,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939173 @Test fun verifyTheWhatIsBrokenErrorMessageTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -859,7 +859,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939175 @Test fun verifyThatTheBrokenSiteFormSubmissionCanBeCanceledTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -881,7 +881,7 @@ class MainMenuTestCompose : TestSetup() { @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1968653") @Test fun verifyTheBrokenSiteFormSubmissionWithOptionalFieldsTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -914,7 +914,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939179 @Test fun verifyThatTheBrokenSiteFormInfoPersistsTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -943,8 +943,8 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939180 @Test fun verifyTheBrokenSiteFormIsEmptyWithoutSubmittingThePreviousOneTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -977,7 +977,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939181 @Test fun verifyThatTheBrokenSiteFormInfoIsErasedWhenKillingTheAppTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -1011,7 +1011,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2939182 @Test fun verifyReportBrokenSiteFormNotDisplayedWhenTelemetryIsDisabledTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu(composeTestRule) { @@ -1131,8 +1131,8 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheMainMenuBackButtonTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val nextWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val nextWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -1150,8 +1150,8 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheMainMenuForwardButtonTest() { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val nextWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val nextWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -1171,7 +1171,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080127 @Test fun verifyTheRefreshButtonTest() { - val refreshWebPage = TestAssetHelper.getRefreshAsset(mockWebServer) + val refreshWebPage = mockWebServer.refreshAsset navigationToolbar { }.enterURLAndEnterToBrowser(refreshWebPage.url) { @@ -1186,7 +1186,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheExtensionsMainMenuListTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -1202,7 +1202,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080135 @Test fun verifyTheMoreMainMenuListTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURLAndEnterToBrowser(firstTestPage.url) { @@ -1216,7 +1216,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheBookmarksMainMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -1231,7 +1231,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080140 @Test fun verifyTheSignInMainMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -1246,7 +1246,7 @@ class MainMenuTestCompose : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3080144 @Test fun verifyTheSettingsMainMenuItemTest() { - val testPage = getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -1263,7 +1263,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheMainMenuBackButtonFromCustomTabTest() { val customMenuItem = "TestMenuItem" - val customTabPage = getGenericAsset(mockWebServer, 4) + val customTabPage = mockWebServer.getGenericAsset(4) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -1289,8 +1289,8 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheMainMenuForwardButtonFromCustomTabTest() { val customMenuItem = "TestMenuItem" - val firstCustomTabPage = getGenericAsset(mockWebServer, 4) - val secondCustomTabPage = getGenericAsset(mockWebServer, 1) + val firstCustomTabPage = mockWebServer.getGenericAsset(4) + val secondCustomTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -1319,7 +1319,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheMainMenuRefreshButtonFromCustomTabTest() { val customMenuItem = "TestMenuItem" - val customTabPage = TestAssetHelper.getRefreshAsset(mockWebServer) + val customTabPage = mockWebServer.refreshAsset intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -1343,7 +1343,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifyTheMainMenuShareButtonFromCustomTabTest() { val customMenuItem = "TestMenuItem" - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -1364,7 +1364,7 @@ class MainMenuTestCompose : TestSetup() { @Test fun verifySwitchToDesktopSiteIsDisabledOnPDFsFromCustomTabTest() { val customMenuItem = "TestMenuItem" - val customTabPDF = getPdfFormAsset(mockWebServer) + val customTabPDF = mockWebServer.pdfFormAsset intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -1389,7 +1389,7 @@ class MainMenuTestCompose : TestSetup() { @SmokeTest @Test fun verifyTheMoreMainMenuSubListTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURLAndEnterToBrowser(firstTestPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt @@ -12,7 +12,8 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.MatcherHelper import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.audioPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.videoPageAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText import org.mozilla.fenix.helpers.TestSetup @@ -47,7 +48,7 @@ class MediaNotificationTest : TestSetup() { @SmokeTest @Test fun verifyVideoPlaybackSystemNotificationTest() { - val videoTestPage = TestAssetHelper.getVideoPageAsset(mockWebServer) + val videoTestPage = mockWebServer.videoPageAsset navigationToolbar { }.enterURLAndEnterToBrowser(videoTestPage.url) { @@ -82,7 +83,7 @@ class MediaNotificationTest : TestSetup() { @SmokeTest @Test fun verifyAudioPlaybackSystemNotificationTest() { - val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer) + val audioTestPage = mockWebServer.audioPageAsset navigationToolbar { }.enterURLAndEnterToBrowser(audioTestPage.url) { @@ -116,7 +117,7 @@ class MediaNotificationTest : TestSetup() { // TestRail: https://mozilla.testrail.io/index.php?/cases/view/903595 @Test fun mediaSystemNotificationInPrivateModeTest() { - val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer) + val audioTestPage = mockWebServer.audioPageAsset homeScreen { }.openTabDrawer(composeTestRule) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MicrosurveyTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MicrosurveyTest.kt @@ -10,7 +10,7 @@ import org.mozilla.fenix.R import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -34,7 +34,7 @@ class MicrosurveyTest : TestSetup() { @SmokeTest @Test fun activationOfThePrintMicrosurveyTest() { - val testPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -53,8 +53,8 @@ class MicrosurveyTest : TestSetup() { @SmokeTest @Test fun verifyTheSurveyRemainsActivatedWhileChangingTabsTest() { - val testPage1 = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val testPage2 = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val testPage1 = mockWebServer.getGenericAsset(1) + val testPage2 = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(testPage1.url) { @@ -82,7 +82,7 @@ class MicrosurveyTest : TestSetup() { @SmokeTest @Test fun verifyTheSurveyConfirmationSheetTest() { - val testPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -104,7 +104,7 @@ class MicrosurveyTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2809344 @Test fun dismissTheSurveyPromptTest() { - val testPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt @@ -13,7 +13,7 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.AppAndSystemHelper.enableOrDisableBackGestureNavigationOnDevice import org.mozilla.fenix.helpers.AppAndSystemHelper.runWithAppLocaleChanged import org.mozilla.fenix.helpers.HomeActivityTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup @@ -48,8 +48,8 @@ class NavigationToolbarTest : TestSetup() { @Test @SkipLeaks fun swipeToSwitchTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) // Disable the back gesture from the edge of the screen on the device. enableOrDisableBackGestureNavigationOnDevice(backGestureNavigationEnabled = false) @@ -70,8 +70,8 @@ class NavigationToolbarTest : TestSetup() { @Test @SkipLeaks fun swipeToSwitchTabInRTLTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) val arabicLocale = Locale.Builder().setLanguage("ar").setRegion("AR").build() // Disable the back gesture from the edge of the screen on the device. @@ -112,7 +112,7 @@ class NavigationToolbarTest : TestSetup() { @SmokeTest @Test fun verifyInsecurePageSecuritySubMenuTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -145,7 +145,7 @@ class NavigationToolbarTest : TestSetup() { @SmokeTest @Test fun goToHomeScreenTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -159,7 +159,7 @@ class NavigationToolbarTest : TestSetup() { @SmokeTest @Test fun goToHomeScreenInPrivateModeTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) homeScreen { togglePrivateBrowsingModeOnOff(composeTestRule = composeTestRule) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTestCompose.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTestCompose.kt @@ -41,9 +41,9 @@ import org.mozilla.fenix.helpers.MockBrowserDataHelper.createHistoryItem import org.mozilla.fenix.helpers.MockBrowserDataHelper.generateBookmarkFolder import org.mozilla.fenix.helpers.MockBrowserDataHelper.setCustomSearchEngine import org.mozilla.fenix.helpers.SearchDispatcher -import org.mozilla.fenix.helpers.TestAssetHelper import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset -import org.mozilla.fenix.helpers.TestAssetHelper.getLoremIpsumAsset +import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset +import org.mozilla.fenix.helpers.TestAssetHelper.loremIpsumAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton @@ -165,7 +165,7 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowserWithComposableToolbar(composeTestRule, defaultWebPage.url) { @@ -214,7 +214,7 @@ class NavigationToolbarTestCompose : TestSetup() { ) { // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed. val fenixApp = composeTestRule.activity.applicationContext as FenixApplication - val webpage = getLoremIpsumAsset(mockWebServer).url + val webpage = mockWebServer.loremIpsumAsset.url // This value will represent the text size percentage the webpage will scale to. The default value is 100%. val textSizePercentage = 180 @@ -250,8 +250,8 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.htmlControlsFormAsset val newFolder = generateBookmarkFolder(title = bookmarkFolderName, position = null) createBookmarkItem(firstWebPage.url.toString(), firstWebPage.title, null, newFolder) @@ -282,7 +282,7 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { val customMenuItem = "TestMenuItem" - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -390,8 +390,8 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val firstPageUrl = getGenericAsset(searchMockServer, 1) - val secondPageUrl = getGenericAsset(searchMockServer, 2) + val firstPageUrl = searchMockServer.getGenericAsset(1) + val secondPageUrl = searchMockServer.getGenericAsset(2) createHistoryItem(firstPageUrl.url.toString()) createHistoryItem(secondPageUrl.url.toString()) @@ -428,7 +428,7 @@ class NavigationToolbarTestCompose : TestSetup() { fun searchEnginesCanBeChangedTemporarilyFromSearchSelectorMenuTest() { runWithCondition( composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && - composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, + composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { (generalEnginesList + topicEnginesList).forEach { homeScreen { @@ -455,7 +455,7 @@ class NavigationToolbarTestCompose : TestSetup() { ) { TestHelper.appContext.settings().shouldShowSearchSuggestionsInPrivate = true - val firstPageUrl = getGenericAsset(searchMockServer, 1) + val firstPageUrl = searchMockServer.getGenericAsset(1) val searchEngineName = "TestSearchEngine" setCustomSearchEngine(searchMockServer, searchEngineName) @@ -503,8 +503,8 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val firstPageUrl = getGenericAsset(searchMockServer, 1).url - val secondPageUrl = getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url val searchEngineName = "TestSearchEngine" // setting our custom mockWebServer search URL setCustomSearchEngine(searchMockServer, searchEngineName) @@ -583,8 +583,8 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) // Disable the back gesture from the edge of the screen on the device. enableOrDisableBackGestureNavigationOnDevice(backGestureNavigationEnabled = false) @@ -719,7 +719,7 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val websiteURL = getGenericAsset(mockWebServer, 1).url.toString() + val websiteURL = mockWebServer.getGenericAsset(1).url.toString() createHistoryItem(websiteURL) @@ -750,7 +750,7 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val website = getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) createBookmarkItem(website.url.toString(), website.title, 1u) @@ -845,8 +845,8 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val firstWebPage = getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowserWithComposableToolbar(composeTestRule, firstWebPage.url) { @@ -974,7 +974,7 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.BETA && composeTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE, ) { - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt @@ -48,8 +48,7 @@ class PDFViewerTest : TestSetup() { @SmokeTest @Test fun verifyPDFFileIsOpenedInTheSameTabTest() { - val genericURL = - getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -64,7 +63,7 @@ class PDFViewerTest : TestSetup() { // Download PDF file using the download toolbar button @Test fun verifyPDFViewerDownloadButtonTest() { - val genericURL = getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) val downloadFile = "pdfForm.pdf" navigationToolbar { @@ -81,7 +80,7 @@ class PDFViewerTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2283305 @Test fun pdfFindInPageTest() { - val genericURL = getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -134,7 +133,7 @@ class PDFViewerTest : TestSetup() { // Download PDF file using the download toolbar button @Test fun verifyDownloadedPDFIsOpenedInFirefoxTest() { - val genericURL = getGenericAsset(mockWebServer, 3) + val genericURL = mockWebServer.getGenericAsset(3) val downloadFile = "pdfForm.pdf" navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/PromptTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/PromptTest.kt @@ -3,13 +3,12 @@ package org.mozilla.fenix.ui import androidx.compose.ui.test.junit4.AndroidComposeTestRule import org.junit.Rule import org.junit.Test -import org.mozilla.fenix.R -import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.MatcherHelper import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.promptAsset import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule import org.mozilla.fenix.ui.robots.clickPageObject @@ -35,8 +34,8 @@ class PromptTest : TestSetup() { @Test fun verifyBeforeUnloadPrompt() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val promptWebPage = TestAssetHelper.getPromptAsset(mockWebServer) + val defaultWebPage = mockWebServer.getGenericAsset(1) + val promptWebPage = mockWebServer.promptAsset navigationToolbar { }.enterURLAndEnterToBrowser(promptWebPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt @@ -7,12 +7,12 @@ package org.mozilla.fenix.ui import android.view.View import org.junit.Rule import org.junit.Test -import org.mozilla.fenix.R import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingResources import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.loremIpsumAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource @@ -52,10 +52,8 @@ class ReaderViewTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/250592 @Test fun verifyReaderModePageDetectionTest() { - val readerViewPage = - TestAssetHelper.getLoremIpsumAsset(mockWebServer) - val genericPage = - TestAssetHelper.getGenericAsset(mockWebServer, 1) + val readerViewPage = mockWebServer.loremIpsumAsset + val genericPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(readerViewPage.url) { @@ -82,8 +80,7 @@ class ReaderViewTest : TestSetup() { @SmokeTest @Test fun verifyReaderModeControlsTest() { - val readerViewPage = - TestAssetHelper.getLoremIpsumAsset(mockWebServer) + val readerViewPage = mockWebServer.loremIpsumAsset navigationToolbar { }.enterURLAndEnterToBrowser(readerViewPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/RecentlyClosedTabsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/RecentlyClosedTabsTest.kt @@ -43,7 +43,7 @@ class RecentlyClosedTabsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1956220"]) fun openRecentlyClosedItemTest() { - val website = getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) homeScreen { }.openNavigationToolbar { @@ -75,7 +75,7 @@ class RecentlyClosedTabsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1956220"]) fun deleteRecentlyClosedTabsItemTest() { - val website = getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) homeScreen { }.openNavigationToolbar { @@ -103,8 +103,8 @@ class RecentlyClosedTabsTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun openMultipleRecentlyClosedTabsTest() { - val firstPage = getGenericAsset(mockWebServer, 1) - val secondPage = getGenericAsset(mockWebServer, 2) + val firstPage = mockWebServer.getGenericAsset(1) + val secondPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstPage.url) { @@ -139,8 +139,8 @@ class RecentlyClosedTabsTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun openRecentlyClosedTabsInPrivateBrowsingTest() { - val firstPage = getGenericAsset(mockWebServer, 1) - val secondPage = getGenericAsset(mockWebServer, 2) + val firstPage = mockWebServer.getGenericAsset(1) + val secondPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstPage.url) { @@ -176,8 +176,8 @@ class RecentlyClosedTabsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1956220"]) fun shareMultipleRecentlyClosedTabsTest() { - val firstPage = getGenericAsset(mockWebServer, 1) - val secondPage = getGenericAsset(mockWebServer, 2) + val firstPage = mockWebServer.getGenericAsset(1) + val secondPage = mockWebServer.getGenericAsset(2) val sharingApp = "Gmail" val urlString = "${firstPage.url}\n\n${secondPage.url}" @@ -208,8 +208,8 @@ class RecentlyClosedTabsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1956220"]) fun closedPrivateTabsAreNotSavedInRecentlyClosedTabsTest() { - val firstPage = getGenericAsset(mockWebServer, 1) - val secondPage = getGenericAsset(mockWebServer, 2) + val firstPage = mockWebServer.getGenericAsset(1) + val secondPage = mockWebServer.getGenericAsset(2) homeScreen {}.togglePrivateBrowsingMode() navigationToolbar { @@ -234,8 +234,8 @@ class RecentlyClosedTabsTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1956220"]) fun deletingBrowserHistoryClearsRecentlyClosedTabsListTest() { - val firstPage = getGenericAsset(mockWebServer, 1) - val secondPage = getGenericAsset(mockWebServer, 2) + val firstPage = mockWebServer.getGenericAsset(1) + val secondPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt @@ -37,7 +37,7 @@ import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem import org.mozilla.fenix.helpers.MockBrowserDataHelper.createTabItem import org.mozilla.fenix.helpers.MockBrowserDataHelper.setCustomSearchEngine import org.mozilla.fenix.helpers.SearchDispatcher -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.exitMenu @@ -298,8 +298,8 @@ class SearchTest : TestSetup() { @SmokeTest @Test fun searchResultsOpenedInNewTabsGenerateSearchGroupsTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url val searchEngineName = "TestSearchEngine" // setting our custom mockWebServer search URL setCustomSearchEngine(searchMockServer, searchEngineName) @@ -328,8 +328,8 @@ class SearchTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun verifyAPageIsAddedToASearchGroupOnlyOnceTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url val originPageUrl = "http://localhost:${searchMockServer.port}/pages/searchResults.html?search=firefox".toUri() val searchEngineName = "TestSearchEngine" @@ -432,8 +432,8 @@ class SearchTest : TestSetup() { @SmokeTest @Test fun deleteIndividualHistoryItemsFromSearchGroupTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url // setting our custom mockWebServer search URL val searchEngineName = "TestSearchEngine" setCustomSearchEngine(searchMockServer, searchEngineName) @@ -476,8 +476,8 @@ class SearchTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun deleteSearchGroupFromHomeScreenTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url // setting our custom mockWebServer search URL val searchEngineName = "TestSearchEngine" setCustomSearchEngine(searchMockServer, searchEngineName) @@ -518,8 +518,8 @@ class SearchTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun openAPageFromHomeScreenSearchGroupTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url // setting our custom mockWebServer search URL val searchEngineName = "TestSearchEngine" @@ -568,8 +568,8 @@ class SearchTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun shareAPageFromHomeScreenSearchGroupTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1).url - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2).url + val firstPageUrl = searchMockServer.getGenericAsset(1).url + val secondPageUrl = searchMockServer.getGenericAsset(2).url // setting our custom mockWebServer search URL val searchEngineName = "TestSearchEngine" setCustomSearchEngine(searchMockServer, searchEngineName) @@ -689,8 +689,8 @@ class SearchTest : TestSetup() { // Test that verifies the Firefox Suggest results in a general search context @Test fun verifyFirefoxSuggestHeaderForBrowsingDataSuggestionsTest() { - val firstPage = TestAssetHelper.getGenericAsset(searchMockServer, 1) - val secondPage = TestAssetHelper.getGenericAsset(searchMockServer, 2) + val firstPage = searchMockServer.getGenericAsset(1) + val secondPage = searchMockServer.getGenericAsset(2) createTabItem(firstPage.url.toString()) createBookmarkItem(secondPage.url.toString(), secondPage.title, 1u) @@ -713,8 +713,8 @@ class SearchTest : TestSetup() { @SmokeTest @Test fun verifyHistorySearchWithBrowsingHistoryTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1) - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2) + val firstPageUrl = searchMockServer.getGenericAsset(1) + val secondPageUrl = searchMockServer.getGenericAsset(2) MockBrowserDataHelper.createHistoryItem(firstPageUrl.url.toString()) MockBrowserDataHelper.createHistoryItem(secondPageUrl.url.toString()) @@ -773,8 +773,8 @@ class SearchTest : TestSetup() { @SmokeTest @Test fun verifyTabsSearchWithOpenTabsTest() { - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1) - val secondPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 2) + val firstPageUrl = searchMockServer.getGenericAsset(1) + val secondPageUrl = searchMockServer.getGenericAsset(2) createTabItem(firstPageUrl.url.toString()) createTabItem(secondPageUrl.url.toString()) @@ -891,7 +891,7 @@ class SearchTest : TestSetup() { fun searchHistoryNotRememberedInPrivateBrowsingTest() { TestHelper.appContext.settings().shouldShowSearchSuggestionsInPrivate = true - val firstPageUrl = TestAssetHelper.getGenericAsset(searchMockServer, 1) + val firstPageUrl = searchMockServer.getGenericAsset(1) val searchEngineName = "TestSearchEngine" setCustomSearchEngine(searchMockServer, searchEngineName) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt @@ -15,7 +15,7 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.registerAndCleanupIdlingReso import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.RecyclerViewIdlingResource -import org.mozilla.fenix.helpers.TestAssetHelper.getEnhancedTrackingProtectionAsset +import org.mozilla.fenix.helpers.TestAssetHelper.enhancedTrackingProtectionAsset import org.mozilla.fenix.helpers.TestHelper import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -115,7 +115,7 @@ class SettingsAddonsTest : TestSetup() { val uBlockAddon = "uBlock Origin" val darkReaderAddon = "Dark Reader" - val trackingProtectionPage = getEnhancedTrackingProtectionAsset(mockWebServer) + val trackingProtectionPage = mockWebServer.enhancedTrackingProtectionAsset addonsMenu { installAddon(uBlockAddon, activityTestRule.activityRule) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt @@ -16,6 +16,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.OpenLinksInApp import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.externalLinksAsset import org.mozilla.fenix.helpers.TestHelper import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.mDevice @@ -47,7 +48,7 @@ class SettingsAdvancedTest : TestSetup() { @Before override fun setUp() { super.setUp() - externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + externalLinksPage = mockWebServer.externalLinksAsset } // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2092699 diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt @@ -12,7 +12,7 @@ import org.mozilla.fenix.customannotations.SkipLeaks import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.AppAndSystemHelper.enableOrDisableBackGestureNavigationOnDevice import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.restartApp import org.mozilla.fenix.helpers.TestHelper.verifyDarkThemeApplied @@ -89,8 +89,8 @@ class SettingsCustomizeTest : TestSetup() { @Test @SkipLeaks fun turnOffSwipeToSwitchTabsPreferenceTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) // Disable the back gesture from the edge of the screen on the device. enableOrDisableBackGestureNavigationOnDevice(backGestureNavigationEnabled = false) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt @@ -18,8 +18,9 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.setNetworkEnabled import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper -import org.mozilla.fenix.helpers.TestAssetHelper -import org.mozilla.fenix.helpers.TestAssetHelper.getStorageTestAsset +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.storageCheckPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.storageWritePageAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.restartApp @@ -86,7 +87,7 @@ class SettingsDeleteBrowsingDataOnQuitTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/416049 @Test fun deleteOpenTabsOnQuitTest() { - val testPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val testPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu { @@ -111,8 +112,7 @@ class SettingsDeleteBrowsingDataOnQuitTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/416050 @Test fun deleteBrowsingHistoryOnQuitTest() { - val genericPage = - getStorageTestAsset(mockWebServer, "generic1.html") + val genericPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu { @@ -140,10 +140,8 @@ class SettingsDeleteBrowsingDataOnQuitTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/416051 @Test fun deleteCookiesAndSiteDataOnQuitTest() { - val storageWritePage = - getStorageTestAsset(mockWebServer, "storage_write.html") - val storageCheckPage = - getStorageTestAsset(mockWebServer, "storage_check.html") + val storageWritePage = mockWebServer.storageWritePageAsset + val storageCheckPage = mockWebServer.storageCheckPageAsset homeScreen { }.openThreeDotMenu { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt @@ -16,8 +16,9 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.setNetworkEnabled import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId -import org.mozilla.fenix.helpers.TestAssetHelper -import org.mozilla.fenix.helpers.TestAssetHelper.getStorageTestAsset +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.storageCheckPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.storageWritePageAsset import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.restartApp @@ -127,7 +128,7 @@ class SettingsDeleteBrowsingDataTest : TestSetup() { @SmokeTest @Test fun deleteOpenTabsBrowsingDataTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -160,7 +161,7 @@ class SettingsDeleteBrowsingDataTest : TestSetup() { @SmokeTest @Test fun deleteBrowsingHistoryTest() { - val genericPage = getStorageTestAsset(mockWebServer, "generic1.html").url + val genericPage = mockWebServer.getGenericAsset(1).url navigationToolbar { }.enterURLAndEnterToBrowser(genericPage) { @@ -192,9 +193,9 @@ class SettingsDeleteBrowsingDataTest : TestSetup() { @Test @SkipLeaks fun deleteCookiesAndSiteDataTest() { - val genericPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html").url - val storageCheckPage = getStorageTestAsset(mockWebServer, "storage_check.html").url + val genericPage = mockWebServer.getGenericAsset(1) + val storageWritePage = mockWebServer.storageWritePageAsset.url + val storageCheckPage = mockWebServer.storageCheckPageAsset.url // Browsing a generic page to allow GV to load on a fresh run navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt @@ -16,7 +16,7 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.runWithSystemLocaleChanged import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.RecyclerViewIdlingResource -import org.mozilla.fenix.helpers.TestAssetHelper.getLoremIpsumAsset +import org.mozilla.fenix.helpers.TestAssetHelper.loremIpsumAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.waitForAppWindowToBeUpdated import org.mozilla.fenix.helpers.TestSetup @@ -70,7 +70,7 @@ class SettingsGeneralTest : TestSetup() { fun verifyFontSizingChangeTest() { // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed. val fenixApp = activityIntentTestRule.activity.applicationContext as FenixApplication - val webpage = getLoremIpsumAsset(mockWebServer).url + val webpage = mockWebServer.loremIpsumAsset.url // This value will represent the text size percentage the webpage will scale to. The default value is 100%. val textSizePercentage = 180 diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt @@ -58,7 +58,7 @@ class SettingsHomepageTest : TestSetup() { "Wikipedia", "Google", ) - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) homeScreen { defaultTopSites.forEach { item -> @@ -87,7 +87,7 @@ class SettingsHomepageTest : TestSetup() { composeTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false } - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -105,7 +105,7 @@ class SettingsHomepageTest : TestSetup() { @SmokeTest @Test fun jumpBackInOptionTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -123,7 +123,7 @@ class SettingsHomepageTest : TestSetup() { @SmokeTest @Test fun recentBookmarksOptionTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -143,7 +143,7 @@ class SettingsHomepageTest : TestSetup() { @SmokeTest @Test fun verifyOpeningScreenOptionsTest() { - val genericURL = getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -180,7 +180,7 @@ class SettingsHomepageTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1569843 @Test fun verifyOpeningScreenAfterLaunchingExternalLinkTest() { - val genericPage = getGenericAsset(mockWebServer, 1) + val genericPage = mockWebServer.getGenericAsset(1) homeScreen { }.openThreeDotMenu { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule import org.junit.Rule import org.junit.Test import org.mozilla.fenix.helpers.HomeActivityTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -85,7 +85,7 @@ class SettingsPrivacyTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1024594 @Test fun allowAppToSendNotifications() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) // Clear all existing notifications notificationShade { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt @@ -11,7 +11,7 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper import org.mozilla.fenix.helpers.AppAndSystemHelper.clickSystemHomeScreenShortcutAddButton import org.mozilla.fenix.helpers.DataGenerationHelper import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.restartApp import org.mozilla.fenix.helpers.TestSetup @@ -53,8 +53,8 @@ class SettingsPrivateBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/420086 @Test fun launchLinksInAPrivateTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) setOpenLinksInPrivateOn() @@ -90,7 +90,7 @@ class SettingsPrivateBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/555776 @Test fun launchPageShortcutInPrivateBrowsingTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) setOpenLinksInPrivateOn() diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt @@ -211,7 +211,7 @@ class SettingsSearchTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/361817 @Test fun disableSearchBrowsingHistorySuggestionsToggleTest() { - val websiteURL = getGenericAsset(mockWebServer, 1).url.toString() + val websiteURL = mockWebServer.getGenericAsset(1).url.toString() createHistoryItem(websiteURL) @@ -237,7 +237,7 @@ class SettingsSearchTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/412926 @Test fun disableSearchBookmarksToggleTest() { - val website = getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) createBookmarkItem(website.url.toString(), website.title, 1u) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt @@ -17,8 +17,8 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.grantSystemPermission import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithText import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset -import org.mozilla.fenix.helpers.TestAssetHelper.getMutedVideoPageAsset -import org.mozilla.fenix.helpers.TestAssetHelper.getVideoPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.mutedVideoPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.videoPageAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper.exitMenu import org.mozilla.fenix.helpers.TestSetup @@ -120,8 +120,8 @@ class SettingsSitePermissionsTest : TestSetup() { @SmokeTest @Test fun verifyAutoplayBlockAudioOnlySettingOnNotMutedVideoTest() { - val genericPage = getGenericAsset(mockWebServer, 1) - val videoTestPage = getVideoPageAsset(mockWebServer) + val genericPage = mockWebServer.getGenericAsset(1) + val videoTestPage = mockWebServer.videoPageAsset homeScreen { }.openThreeDotMenu { @@ -159,8 +159,8 @@ class SettingsSitePermissionsTest : TestSetup() { @SmokeTest @Test fun verifyAutoplayBlockAudioOnlySettingOnMutedVideoTest() { - val genericPage = getGenericAsset(mockWebServer, 1) - val mutedVideoTestPage = getMutedVideoPageAsset(mockWebServer) + val genericPage = mockWebServer.getGenericAsset(1) + val mutedVideoTestPage = mockWebServer.mutedVideoPageAsset navigationToolbar { }.enterURLAndEnterToBrowser(genericPage.url) { @@ -186,8 +186,8 @@ class SettingsSitePermissionsTest : TestSetup() { @Test @SkipLeaks fun verifyAutoplayAllowAudioVideoSettingOnNotMutedVideoTestTest() { - val genericPage = getGenericAsset(mockWebServer, 1) - val videoTestPage = getVideoPageAsset(mockWebServer) + val genericPage = mockWebServer.getGenericAsset(1) + val videoTestPage = mockWebServer.videoPageAsset homeScreen { }.openThreeDotMenu { @@ -222,7 +222,7 @@ class SettingsSitePermissionsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2286806 @Test fun verifyAutoplayAllowAudioVideoSettingOnMutedVideoTest() { - val mutedVideoTestPage = getMutedVideoPageAsset(mockWebServer) + val mutedVideoTestPage = mockWebServer.mutedVideoPageAsset homeScreen { }.openThreeDotMenu { @@ -250,7 +250,7 @@ class SettingsSitePermissionsTest : TestSetup() { @Test @SkipLeaks fun verifyAutoplayBlockAudioAndVideoSettingOnNotMutedVideoTest() { - val videoTestPage = getVideoPageAsset(mockWebServer) + val videoTestPage = mockWebServer.videoPageAsset homeScreen { }.openThreeDotMenu { @@ -282,7 +282,7 @@ class SettingsSitePermissionsTest : TestSetup() { @Test @SkipLeaks fun verifyAutoplayBlockAudioAndVideoSettingOnMutedVideoTest() { - val mutedVideoTestPage = getMutedVideoPageAsset(mockWebServer) + val mutedVideoTestPage = mockWebServer.mutedVideoPageAsset homeScreen { }.openThreeDotMenu { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt @@ -16,7 +16,8 @@ import org.mozilla.fenix.helpers.Constants.defaultTopSitesList import org.mozilla.fenix.helpers.DataGenerationHelper.getSponsoredShortcutTitle import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MockBrowserDataHelper -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset +import org.mozilla.fenix.helpers.TestAssetHelper.loremIpsumAsset import org.mozilla.fenix.helpers.TestHelper.waitForAppWindowToBeUpdated import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -147,10 +148,10 @@ class SponsoredShortcutsTest : TestSetup() { // 1 sponsored shortcut should be displayed if there are 7 pinned top sites @Test fun verifySponsoredShortcutsListWithSevenPinnedSitesTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) - val thirdWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3) - val fourthWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 4) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) + val thirdWebPage = mockWebServer.getGenericAsset(3) + val fourthWebPage = mockWebServer.getGenericAsset(4) homeScreen { verifyExistingTopSitesList(activityIntentTestRule) @@ -200,11 +201,11 @@ class SponsoredShortcutsTest : TestSetup() { @Test fun verifySponsoredShortcutsListWithEightPinnedSitesTest() { val pagesList = listOf( - TestAssetHelper.getGenericAsset(mockWebServer, 1), - TestAssetHelper.getGenericAsset(mockWebServer, 2), - TestAssetHelper.getGenericAsset(mockWebServer, 3), - TestAssetHelper.getGenericAsset(mockWebServer, 4), - TestAssetHelper.getLoremIpsumAsset(mockWebServer), + mockWebServer.getGenericAsset(1), + mockWebServer.getGenericAsset(2), + mockWebServer.getGenericAsset(3), + mockWebServer.getGenericAsset(4), + mockWebServer.loremIpsumAsset, ) homeScreen { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt @@ -14,7 +14,8 @@ import org.mozilla.fenix.ext.settings import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MockBrowserDataHelper import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.genericAssets +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.appContext import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton import org.mozilla.fenix.helpers.TestHelper.closeApp @@ -65,7 +66,7 @@ class TabbedBrowsingTest : TestSetup() { @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405") @Test fun closeAllTabsTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -96,7 +97,7 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2349580 @Test fun closingTabsTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -114,7 +115,7 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/903604 @Test fun swipeToCloseTabsTest() { - val webPages = TestAssetHelper.getGenericAssets(mockWebServer) + val webPages = mockWebServer.genericAssets MockBrowserDataHelper.createTabItem(webPages[0].url.toString()) MockBrowserDataHelper.createTabItem(webPages[1].url.toString()) @@ -151,7 +152,7 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/903591 @Test fun closingPrivateTabsTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) homeScreen { }.togglePrivateBrowsingMode(switchPBModeOn = true) navigationToolbar { @@ -172,7 +173,7 @@ class TabbedBrowsingTest : TestSetup() { @Test @SkipLeaks fun verifyCloseAllPrivateTabsNotificationTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen { }.togglePrivateBrowsingMode() @@ -227,7 +228,7 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/903601 @Test fun verifyTabsTrayWithOpenTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -251,7 +252,7 @@ class TabbedBrowsingTest : TestSetup() { @SmokeTest @Test fun verifyPrivateTabsTrayWithOpenTabTest() { - val website = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val website = mockWebServer.getGenericAsset(1) homeScreen { }.openTabDrawer(composeTestRule) { @@ -274,8 +275,8 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/927314 @Test fun tabsCounterShortcutMenuCloseTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebPage.url) { @@ -305,7 +306,7 @@ class TabbedBrowsingTest : TestSetup() { ], ) fun tabsCounterShortcutMenuNewPrivateTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) {} @@ -322,7 +323,7 @@ class TabbedBrowsingTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1962065"]) fun tabsCounterShortcutMenuNewTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) {} @@ -339,8 +340,8 @@ class TabbedBrowsingTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1962065"]) fun privateTabsCounterShortcutMenuCloseTabTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) homeScreen {}.togglePrivateBrowsingMode(switchPBModeOn = true) navigationToolbar { @@ -371,7 +372,7 @@ class TabbedBrowsingTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1962065"]) fun privateTabsCounterShortcutMenuNewPrivateTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen {}.togglePrivateBrowsingMode(switchPBModeOn = true) navigationToolbar { @@ -391,7 +392,7 @@ class TabbedBrowsingTest : TestSetup() { @Test @SkipLeaks(reasons = ["https://bugzilla.mozilla.org/show_bug.cgi?id=1962065"]) fun privateTabsCounterShortcutMenuNewTabTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen {}.togglePrivateBrowsingMode(switchPBModeOn = true) navigationToolbar { @@ -425,8 +426,8 @@ class TabbedBrowsingTest : TestSetup() { @SmokeTest @Test fun shareTabsFromTabsTrayTest() { - val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebsite = mockWebServer.getGenericAsset(1) + val secondWebsite = mockWebServer.getGenericAsset(2) val firstWebsiteTitle = firstWebsite.title val secondWebsiteTitle = secondWebsite.title val sharingApp = "Gmail" @@ -463,7 +464,7 @@ class TabbedBrowsingTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/526244 @Test fun privateModeStaysAsDefaultAfterRestartTest() { - val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -485,8 +486,8 @@ class TabbedBrowsingTest : TestSetup() { @SmokeTest @Test fun privateTabsDoNotPersistAfterClosingAppTest() { - val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebPage = mockWebServer.getGenericAsset(1) + val secondWebPage = mockWebServer.getGenericAsset(2) homeScreen { }.togglePrivateBrowsingMode() @@ -511,7 +512,7 @@ class TabbedBrowsingTest : TestSetup() { fun verifyTabsTrayListView() { appContext.settings().gridTabView = false - val webPages = TestAssetHelper.getGenericAssets(mockWebServer) + val webPages = mockWebServer.genericAssets MockBrowserDataHelper.createTabItem(webPages[0].url.toString()) MockBrowserDataHelper.createTabItem(webPages[1].url.toString()) @@ -538,7 +539,7 @@ class TabbedBrowsingTest : TestSetup() { fun verifyTabsTrayGridView() { appContext.settings().gridTabView = true - val webPages = TestAssetHelper.getGenericAssets(mockWebServer) + val webPages = mockWebServer.genericAssets MockBrowserDataHelper.createTabItem(webPages[0].url.toString()) MockBrowserDataHelper.createTabItem(webPages[1].url.toString()) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TextFragmentsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TextFragmentsTest.kt @@ -7,7 +7,7 @@ import org.junit.Rule import org.junit.Test import org.mozilla.fenix.helpers.AppAndSystemHelper.clickSystemHomeScreenShortcutAddButton import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper.getTextFragmentAsset +import org.mozilla.fenix.helpers.TestAssetHelper.textFragmentAsset import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule import org.mozilla.fenix.ui.robots.browserScreen @@ -27,7 +27,7 @@ class TextFragmentsTest : TestSetup() { @SdkSuppress(minSdkVersion = 34) @Test fun verifyTheTextFragmentUrlAddedToHomescreenTest() { - val genericPage = getTextFragmentAsset(mockWebServer) + val genericPage = mockWebServer.textFragmentAsset val textFragmentLink = genericPage.url.toString() + "#:~:text=Firefox" navigationToolbar { @@ -46,7 +46,7 @@ class TextFragmentsTest : TestSetup() { @SdkSuppress(minSdkVersion = 34) @Test fun verifyTheTextFragmentLinksInHistoryTest() { - val genericPage = getTextFragmentAsset(mockWebServer) + val genericPage = mockWebServer.textFragmentAsset val textFragmentLink = genericPage.url.toString() + "#:~:text=Firefox" navigationToolbar { @@ -68,7 +68,7 @@ class TextFragmentsTest : TestSetup() { @SdkSuppress(minSdkVersion = 34) @Test fun verifyTheTextFragmentLinksInBookmarksTest() { - val genericPage = getTextFragmentAsset(mockWebServer) + val genericPage = mockWebServer.textFragmentAsset val textFragmentLink = genericPage.url.toString() + "#:~:text=Firefox" navigationToolbar { @@ -94,7 +94,7 @@ class TextFragmentsTest : TestSetup() { @SdkSuppress(minSdkVersion = 34) @Test fun sendTextFragmentTabToDeviceTest() { - val genericPage = getTextFragmentAsset(mockWebServer) + val genericPage = mockWebServer.textFragmentAsset val textFragmentLink = genericPage.url.toString() + "#:~:text=Firefox" navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TextSelectionTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TextSelectionTest.kt @@ -16,7 +16,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText import org.mozilla.fenix.helpers.MatcherHelper.itemWithText import org.mozilla.fenix.helpers.RetryTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -54,7 +54,7 @@ class TextSelectionTest : TestSetup() { @SmokeTest @Test fun verifySelectAllTextOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -78,7 +78,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326828 @Test fun verifyCopyTextOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -98,7 +98,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326829 @Test fun verifyShareSelectedTextOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -111,7 +111,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326830 @Test fun verifySearchTextOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -127,7 +127,7 @@ class TextSelectionTest : TestSetup() { @SmokeTest @Test fun verifyPrivateSearchTextTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) homeScreen { }.togglePrivateBrowsingMode() @@ -147,7 +147,7 @@ class TextSelectionTest : TestSetup() { @Test fun verifySelectAllPDFTextOptionTest() { val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -177,7 +177,7 @@ class TextSelectionTest : TestSetup() { @Test fun verifyCopyPDFTextOptionTest() { val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -200,7 +200,7 @@ class TextSelectionTest : TestSetup() { @Test fun verifyShareSelectedPDFTextOptionTest() { val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -217,7 +217,7 @@ class TextSelectionTest : TestSetup() { @Test fun verifySearchPDFTextOptionTest() { val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + mockWebServer.getGenericAsset(3) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -234,7 +234,7 @@ class TextSelectionTest : TestSetup() { @Test fun verifyPrivateSearchPDFTextOptionTest() { val genericURL = - TestAssetHelper.getGenericAsset(mockWebServer, 3) + mockWebServer.getGenericAsset(3) homeScreen { }.togglePrivateBrowsingMode() @@ -253,7 +253,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326813 @Test fun verifyUrlBarTextSelectionOptionsTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -266,7 +266,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326814 @Test fun verifyCopyUrlBarTextSelectionOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -284,7 +284,7 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2326815 @Test fun verifyCutUrlBarTextSelectionOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -302,7 +302,7 @@ class TextSelectionTest : TestSetup() { @SmokeTest @Test fun verifyShareUrlBarTextSelectionOptionTest() { - val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1) + val genericURL = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericURL.url) { @@ -318,8 +318,8 @@ class TextSelectionTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/414316 @Test fun urlBarQuickActionsTest() { - val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2) + val firstWebsite = mockWebServer.getGenericAsset(1) + val secondWebsite = mockWebServer.getGenericAsset(2) navigationToolbar { }.enterURLAndEnterToBrowser(firstWebsite.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt @@ -45,7 +45,7 @@ class TopSitesTest : TestSetup() { @SmokeTest @Test fun addAWebsiteAsATopSiteTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) homeScreen { verifyExistingTopSitesList(activityIntentTestRule) @@ -67,7 +67,7 @@ class TopSitesTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/532599 @Test fun openTopSiteInANewTabTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper.addPinnedSite( Pair(webPage.title, webPage.url.toString()), @@ -92,7 +92,7 @@ class TopSitesTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/532600 @Test fun openTopSiteInANewPrivateTabTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper.addPinnedSite( Pair(webPage.title, webPage.url.toString()), @@ -112,8 +112,8 @@ class TopSitesTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1110321 @Test fun editTopSiteTest() { - val webPage = getGenericAsset(mockWebServer, 1) - val newWebPageURL = getGenericAsset(mockWebServer, 2) + val webPage = mockWebServer.getGenericAsset(1) + val newWebPageURL = mockWebServer.getGenericAsset(2) val newPageTitle = generateRandomString(5) MockBrowserDataHelper.addPinnedSite( @@ -136,7 +136,7 @@ class TopSitesTest : TestSetup() { @Test fun editTopSiteTestWithInvalidURL() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) val newPageTitle = generateRandomString(5) MockBrowserDataHelper.addPinnedSite( @@ -157,7 +157,7 @@ class TopSitesTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/532601 @Test fun removeTopSiteUsingMenuButtonTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper.addPinnedSite( Pair(webPage.title, webPage.url.toString()), @@ -177,7 +177,7 @@ class TopSitesTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2323641 @Test fun removeTopSiteFromMainMenuTest() { - val webPage = getGenericAsset(mockWebServer, 1) + val webPage = mockWebServer.getGenericAsset(1) MockBrowserDataHelper.addPinnedSite( Pair(webPage.title, webPage.url.toString()), @@ -212,7 +212,7 @@ class TopSitesTest : TestSetup() { @SmokeTest @Test fun addAndRemoveMostViewedTopSiteTest() { - val defaultWebPage = getGenericAsset(mockWebServer, 1) + val defaultWebPage = mockWebServer.getGenericAsset(1) for (i in 0..1) { navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TranslationsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TranslationsTest.kt @@ -14,7 +14,8 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.helpers.AppAndSystemHelper.disableWifiNetworkConnection import org.mozilla.fenix.helpers.AppAndSystemHelper.enableDataSaverSystemSetting import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.firstForeignWebPageAsset +import org.mozilla.fenix.helpers.TestAssetHelper.secondForeignWebPageAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -42,7 +43,7 @@ class TranslationsTest : TestSetup() { @Test @SkipLeaks fun verifyTheFirstTranslationNotNowButtonFunctionalityTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -66,7 +67,7 @@ class TranslationsTest : TestSetup() { @SmokeTest @Test fun verifyMainMenuTranslationButtonFunctionalityTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -88,7 +89,7 @@ class TranslationsTest : TestSetup() { @SmokeTest @Test fun verifyTheDownloadLanguagesFunctionalityTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(firstTestPage.url) { @@ -107,8 +108,8 @@ class TranslationsTest : TestSetup() { @SmokeTest @Test fun verifyTheNeverTranslateOptionTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) - val secondTestPage = TestAssetHelper.getSecondForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset + val secondTestPage = mockWebServer.secondForeignWebPageAsset navigationToolbar { }.enterURL(firstTestPage.url) { @@ -144,7 +145,7 @@ class TranslationsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2436642 @Test fun verifyFirstTranslationBottomSheetTranslateFunctionalityTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -159,7 +160,7 @@ class TranslationsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2437112 @Test fun verifyTheShowOriginalTranslationOptionTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -179,7 +180,7 @@ class TranslationsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2437111 @Test fun changeTheTranslateToLanguageTest() { - val testPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val testPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(testPage.url) { @@ -201,8 +202,8 @@ class TranslationsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2437992 @Test fun verifyTheAlwaysTranslateOptionTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) - val secondTestPage = TestAssetHelper.getSecondForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset + val secondTestPage = mockWebServer.secondForeignWebPageAsset navigationToolbar { }.enterURL(secondTestPage.url) { @@ -237,7 +238,7 @@ class TranslationsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2439960 @Test fun verifyTheSiteDeletionFromTheNeverTranslateListTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(firstTestPage.url) { @@ -270,7 +271,7 @@ class TranslationsTest : TestSetup() { @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1965222") @Test fun downloadLanguageWhileDataSaverModeIsOnTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset navigationToolbar { }.enterURL(firstTestPage.url) { @@ -296,8 +297,8 @@ class TranslationsTest : TestSetup() { @Test @SkipLeaks fun verifyTheAlwaysOfferToTranslateOptionTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) - val secondTestPage = TestAssetHelper.getSecondForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset + val secondTestPage = mockWebServer.secondForeignWebPageAsset navigationToolbar { }.enterURL(firstTestPage.url) { @@ -325,7 +326,7 @@ class TranslationsTest : TestSetup() { @SmokeTest @Test fun verifyTheTranslationIsDisplayedAutomaticallyTest() { - val firstTestPage = TestAssetHelper.getFirstForeignWebPageAsset(mockWebServer) + val firstTestPage = mockWebServer.firstForeignWebPageAsset val secondTestPage = "https://mozilla-mobile.github.io/testapp/v2.0/germanForeignWebPage.html" navigationToolbar { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/UnifiedTrustPanelTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/UnifiedTrustPanelTest.kt @@ -16,7 +16,7 @@ import org.mozilla.fenix.customannotations.SmokeTest import org.mozilla.fenix.ext.settings import org.mozilla.fenix.helpers.DataGenerationHelper.createCustomTabIntent import org.mozilla.fenix.helpers.HomeActivityIntentTestRule -import org.mozilla.fenix.helpers.TestAssetHelper.getEnhancedTrackingProtectionAsset +import org.mozilla.fenix.helpers.TestAssetHelper.enhancedTrackingProtectionAsset import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong import org.mozilla.fenix.helpers.TestHelper.appContext @@ -86,8 +86,8 @@ class UnifiedTrustPanelTest : TestSetup() { @Test fun verifyInsecurePageConnectionFromQuickSettingsWithTrackersTest() { appContext.settings().setStrictETP() - val genericPage = getGenericAsset(mockWebServer, 1) - val trackingProtectionPage = getEnhancedTrackingProtectionAsset(mockWebServer).url + val genericPage = mockWebServer.getGenericAsset(1) + val trackingProtectionPage = mockWebServer.enhancedTrackingProtectionAsset.url // browsing a generic page to allow GV to load on a fresh run navigationToolbar { @@ -150,7 +150,7 @@ class UnifiedTrustPanelTest : TestSetup() { @Test fun verifySecurePageConnectionFromQuickSettingsWithTrackersTest() { appContext.settings().setStrictETP() - val genericPage = getGenericAsset(mockWebServer, 1) + val genericPage = mockWebServer.getGenericAsset(1) val trackingProtectionPage = "https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection" // browsing a generic page to allow GV to load on a fresh run @@ -189,7 +189,7 @@ class UnifiedTrustPanelTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/3186720 @Test fun verifyInsecurePageConnectionFromQuickSettingsWithNoTrackersTest() { - val genericPage = getGenericAsset(mockWebServer, 1) + val genericPage = mockWebServer.getGenericAsset(1) navigationToolbar { }.enterURLAndEnterToBrowser(genericPage.url) { @@ -263,7 +263,7 @@ class UnifiedTrustPanelTest : TestSetup() { @Test fun verifySecurePageConnectionFromQuickSettingsWithTrackersInCustomTabsTest() { appContext.settings().setStrictETP() - val genericPage = getGenericAsset(mockWebServer, 1) + val genericPage = mockWebServer.getGenericAsset(1) val customTabPage = "https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection" intentReceiverActivityTestRule.launchActivity( @@ -313,7 +313,7 @@ class UnifiedTrustPanelTest : TestSetup() { @SmokeTest @Test fun verifyInsecurePageConnectionFromQuickSettingsWithNoTrackersInCustomTabsTest() { - val customTabPage = getGenericAsset(mockWebServer, 1) + val customTabPage = mockWebServer.getGenericAsset(1) intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( @@ -375,7 +375,7 @@ class UnifiedTrustPanelTest : TestSetup() { fun verifyInsecurePageConnectionFromQuickSettingsWithTrackersInCustomTabsTest() { appContext.settings().setStrictETP() - val customTabPage = getEnhancedTrackingProtectionAsset(mockWebServer).url + val customTabPage = mockWebServer.enhancedTrackingProtectionAsset.url intentReceiverActivityTestRule.launchActivity( createCustomTabIntent( diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/UploadPermissionsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/UploadPermissionsTest.kt @@ -13,7 +13,7 @@ import org.mozilla.fenix.helpers.AppAndSystemHelper.grantSystemPermission import org.mozilla.fenix.helpers.AppAndSystemHelper.verifySystemPhotoAndVideoPickerExists import org.mozilla.fenix.helpers.HomeActivityIntentTestRule import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId -import org.mozilla.fenix.helpers.TestAssetHelper +import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule import org.mozilla.fenix.ui.robots.clickPageObject @@ -41,7 +41,7 @@ class UploadPermissionsTest : TestSetup() { @SmokeTest @Test fun fileUploadPermissionTest() { - val testPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val testPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -59,7 +59,7 @@ class UploadPermissionsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2751914 @Test fun uploadSelectedAudioFilesWhileNoPermissionGrantedTest() { - val testPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val testPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -75,7 +75,7 @@ class UploadPermissionsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2779525 @Test fun uploadSelectedAudioFilesWhenStoragePermissionGrantedTest() { - val testPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val testPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { @@ -93,7 +93,7 @@ class UploadPermissionsTest : TestSetup() { @SdkSuppress(minSdkVersion = 33) @Test fun uploadSelectedVideoOrImageFilesWhenStoragePermissionGrantedTest() { - val testPage = TestAssetHelper.getHTMLControlsFormAsset(mockWebServer) + val testPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(testPage.url) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/WebControlsTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/WebControlsTest.kt @@ -13,8 +13,8 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithDescription import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText -import org.mozilla.fenix.helpers.TestAssetHelper -import org.mozilla.fenix.helpers.TestAssetHelper.getHTMLControlsFormAsset +import org.mozilla.fenix.helpers.TestAssetHelper.externalLinksAsset +import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset import org.mozilla.fenix.helpers.TestHelper.waitForAppWindowToBeUpdated import org.mozilla.fenix.helpers.TestSetup import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule @@ -50,7 +50,7 @@ class WebControlsTest : TestSetup() { val currentDay = currentDate.dayOfMonth val currentMonth = currentDate.month val currentYear = currentDate.year - val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer) + val htmlControlsPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(htmlControlsPage.url) { @@ -73,7 +73,7 @@ class WebControlsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2316069 @Test fun verifyClockFormInteractionsTest() { - val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer) + val htmlControlsPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(htmlControlsPage.url) { @@ -96,7 +96,7 @@ class WebControlsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2316068 @Test fun verifyColorPickerInteractionsTest() { - val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer) + val htmlControlsPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(htmlControlsPage.url) { @@ -116,7 +116,7 @@ class WebControlsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2316070 @Test fun verifyDropdownMenuInteractionsTest() { - val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer) + val htmlControlsPage = mockWebServer.htmlControlsFormAsset navigationToolbar { }.enterURLAndEnterToBrowser(htmlControlsPage.url) { @@ -130,7 +130,7 @@ class WebControlsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2316071 @Test fun verifyEmailLinkTest() { - val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + val externalLinksPage = mockWebServer.externalLinksAsset navigationToolbar { }.enterURLAndEnterToBrowser(externalLinksPage.url) { @@ -144,7 +144,7 @@ class WebControlsTest : TestSetup() { // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/834205 @Test fun verifyTelephoneLinkTest() { - val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + val externalLinksPage = mockWebServer.externalLinksAsset navigationToolbar { }.enterURLAndEnterToBrowser(externalLinksPage.url) {