From b1df05835fd9852816183c8f489993484a42e636 Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Fri, 26 May 2023 12:08:17 +0300
Subject: [PATCH] Bug 1833874 - Replace connection error test steps

---
 .../mozilla/fenix/helpers/RetryTestRule.kt    |  7 ++++
 .../fenix/ui/BrowsingErrorPagesTest.kt        | 42 ++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/RetryTestRule.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/RetryTestRule.kt
index 542ec03966..89f01e6527 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/RetryTestRule.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/RetryTestRule.kt
@@ -15,6 +15,7 @@ import org.junit.runners.model.Statement
 import org.mozilla.fenix.components.PermissionStorage
 import org.mozilla.fenix.helpers.IdlingResourceHelper.unregisterAllIdlingResources
 import org.mozilla.fenix.helpers.TestHelper.appContext
+import org.mozilla.fenix.helpers.TestHelper.setNetworkEnabled
 
 /**
  *  Rule to retry flaky tests for a given number of times, catching some of the more common exceptions.
@@ -34,6 +35,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                     base.evaluate()
                     break
                 } catch (t: AssertionError) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
@@ -50,6 +52,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                         throw t
                     }
                 } catch (t: UiObjectNotFoundException) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
@@ -58,6 +61,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                         throw t
                     }
                 } catch (t: NoMatchingViewException) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
@@ -66,6 +70,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                         throw t
                     }
                 } catch (t: IdlingResourceTimeoutException) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
@@ -74,6 +79,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                         throw t
                     }
                 } catch (t: RuntimeException) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
@@ -82,6 +88,7 @@ class RetryTestRule(private val retryCount: Int = 5) : TestRule {
                         throw t
                     }
                 } catch (t: NullPointerException) {
+                    setNetworkEnabled(true)
                     unregisterAllIdlingResources()
                     runBlocking {
                         permissionStorage.deleteAllSitePermissions()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
index 6643254fc8..4fe6154a35 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt
@@ -5,15 +5,18 @@
 package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
+import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
-import org.junit.Ignore
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.RetryTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.getStringResource
 import org.mozilla.fenix.helpers.TestHelper.setNetworkEnabled
 import org.mozilla.fenix.ui.robots.browserScreen
@@ -29,6 +32,7 @@ class BrowsingErrorPagesTest {
     private val unwantedSoftwareWarning =
         getStringResource(R.string.mozac_browser_errorpages_safe_browsing_unwanted_uri_title)
     private val harmfulSiteWarning = getStringResource(R.string.mozac_browser_errorpages_safe_harmful_uri_title)
+    private lateinit var mockWebServer: MockWebServer
 
     @get: Rule
     val mActivityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
@@ -37,10 +41,19 @@ class BrowsingErrorPagesTest {
     @JvmField
     val retryTestRule = RetryTestRule(3)
 
+    @Before
+    fun setUp() {
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
     @After
     fun tearDown() {
         // Restoring network connection
         setNetworkEnabled(true)
+        mockWebServer.shutdown()
     }
 
     @SmokeTest
@@ -87,34 +100,23 @@ class BrowsingErrorPagesTest {
         }
     }
 
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1833874")
+    // Failing with network interruption, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1833874
+    // This tests the server ERROR_CONNECTION_REFUSED
     @Test
-    fun connectionFailureErrorMessageTest() {
-        val url = "example.com"
+    fun connectionRefusedErrorMessageTest() {
+        val testUrl = getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(url.toUri()) {
+        }.enterURLAndEnterToBrowser(testUrl.url) {
             waitForPageToLoad()
-            verifyPageContent("Example Domain")
-        }
-
-        setNetworkEnabled(false)
-
-        browserScreen {
+            verifyPageContent(testUrl.content)
+            // Disconnecting the server
+            mockWebServer.shutdown()
         }.openThreeDotMenu {
         }.refreshPage {
             waitForPageToLoad()
             verifyConnectionErrorMessage()
         }
-
-        setNetworkEnabled(true)
-
-        browserScreen {
-        }.openThreeDotMenu {
-        }.refreshPage {
-            waitForPageToLoad()
-            verifyPageContent("Example Domain")
-        }
     }
 
     @Test