From 11aea321ed4feac491ef882b58ffa12c717e81ab Mon Sep 17 00:00:00 2001
From: Richard Pappalardo <rpappalax@gmail.com>
Date: Wed, 1 Jul 2020 09:15:57 -0700
Subject: [PATCH] Fixes #11642 - Re-enable disabled UI-tests (#12142)

---
 .../androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt    | 4 ++--
 .../androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt   | 2 --
 .../java/org/mozilla/fenix/ui/SettingsAboutTest.kt            | 2 --
 app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt    | 2 --
 .../mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt  | 2 --
 .../java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt         | 2 --
 6 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 216562458..44cec2fa6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -422,7 +422,7 @@ class BookmarksTest {
     }
 
     @Test
-    fun multipleBookmarkDeletions() {
+    fun multipleBookmarkDeletionsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
@@ -527,7 +527,7 @@ class BookmarksTest {
     }
 
     @Test
-    fun verifyCloseMenu() {
+    fun verifyCloseMenuTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
index 8113ad30e..28ccdad03 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
@@ -11,7 +11,6 @@ import org.mozilla.fenix.helpers.HomeActivityTestRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
-import org.junit.Ignore
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.ui.robots.PRIVATE_SESSION_MESSAGE
@@ -117,7 +116,6 @@ class HomeScreenTest {
         }
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun privateModeScreenItemsTest() {
         homeScreen { }.dismissOnboarding()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
index fd54a7502..26368bd0a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
 import org.junit.Rule
 import org.junit.Before
 import org.junit.After
-import org.junit.Ignore
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -70,7 +69,6 @@ class SettingsAboutTest {
 
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun verifyAboutFirefoxPreview() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 0dd1ee8f0..d75a58608 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -9,7 +9,6 @@ import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -23,7 +22,6 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
  * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
  */
 
-@Ignore("Temp disable for triggering a native Gecko crash - https://github.com/mozilla-mobile/fenix/issues/11642")
 class SmokeTest {
     private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
     private lateinit var mockWebServer: MockWebServer
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
index d3a987aee..5ac044f6c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
@@ -8,7 +8,6 @@ import androidx.test.platform.app.InstrumentationRegistry
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ext.settings
@@ -157,7 +156,6 @@ class StrictEnhancedTrackingProtectionTest {
         }
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun testStrictVisitDisableExceptionToggle() {
         val trackingProtectionTest =
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
index 3d86476c5..14f5b94e3 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -53,7 +52,6 @@ class ThreeDotMenuMainTest {
         mockWebServer.shutdown()
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun threeDotMenuItemsTest() {
         homeScreen {