tor-browser

commit 093843b4ac3e5612ea267237f31db7b63abf55f7
parent 7939b8f6b78bd1e58bc0aa5d528ffda4d4c804bb
Author: Olivia Hall <ohall@mozilla.com>
Date:   Wed,  8 Oct 2025 12:26:33 +0000

Bug 1988041 - Adjust PrintDelegateTest to Improve Intermittent Failures r=geckoview-reviewers,m_kato

Seems possible that very occasionally the Android App Print Activity might
actually beat where we register to listen for it. Seems possible that it
could be the root of some intermittents on this test.

Differential Revision: https://phabricator.services.mozilla.com/D267272

Diffstat:
M
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt
 | 
24
++++++++++--------------

1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt
@@ -22,7 +22,6 @@ import org.hamcrest.CoreMatchers.containsString
 import org.junit.After
 import org.junit.Assert.assertTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -134,9 +133,9 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
+            val centerPixel = printCenterPixelColor()
             mainSession.printPageContent()
             val orange = rgb(255, 113, 57)
-            val centerPixel = printCenterPixelColor()
             assertTrue(
                 "Android print opened and rendered.",
                 sessionRule.waitForResult(centerPixel) == orange,
@@ -151,9 +150,9 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.loadTestPath(FT_FONT_HTML_PATH)
             mainSession.waitForPageStop()
             mainSession.printDelegate = activity.view.printDelegate
+            val centerPixel = printCenterPixelColor()
             mainSession.printPageContent()
             val orange = rgb(255, 113, 57)
-            val centerPixel = printCenterPixelColor()
             assertTrue(
                 "Android print opened and rendered.",
                 sessionRule.waitForResult(centerPixel) == orange,
@@ -170,9 +169,9 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
+            val centerPixel = printCenterPixelColor()
             val result = mainSession.didPrintPageContent()
             val orange = rgb(255, 113, 57)
-            val centerPixel = printCenterPixelColor()
             assertTrue(
                 "Android print opened and rendered.",
                 sessionRule.waitForResult(centerPixel) == orange,
@@ -208,7 +207,6 @@ class PrintDelegateTest : BaseSessionTest() {
         }
     }
 
-    @Ignore("https://bugzilla.mozilla.org/show_bug.cgi?id=1988041")
     @NullDelegate(Autofill.Delegate::class)
     @Test
     fun basicWindowDotPrintTest() {
@@ -218,8 +216,8 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
-            mainSession.evaluateJS("window.print();")
             val centerPixel = printCenterPixelColor()
+            mainSession.evaluateJS("window.print();")
             val orange = rgb(255, 113, 57)
             assertTrue(
                 "Android print opened and rendered.",
@@ -237,8 +235,8 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
-            mainSession.evaluateJS("window.print()")
             val centerPixel = printCenterPixelColor()
+            mainSession.evaluateJS("window.print()")
             val orange = rgb(255, 113, 57)
             assertTrue(
                 "Android print opened and rendered.",
@@ -259,7 +257,6 @@ class PrintDelegateTest : BaseSessionTest() {
         }
     }
 
-    @Ignore("https://bugzilla.mozilla.org/show_bug.cgi?id=1988041")
     @NullDelegate(Autofill.Delegate::class)
     @Test
     fun staticContextWindowDotPrintTest() {
@@ -270,8 +267,8 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
-            mainSession.evaluateJS("document.getElementById('print-button').click();")
             val centerPixel = printCenterPixelColor()
+            mainSession.evaluateJS("document.getElementById('print-button').click();")
             val orange = rgb(255, 113, 57)
             assertTrue(
                 "Android print opened and rendered static page.",
@@ -291,8 +288,8 @@ class PrintDelegateTest : BaseSessionTest() {
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
             // iframe window.print button
-            mainSession.evaluateJS("document.getElementById('iframe').contentDocument.getElementById('print-button').click();")
             val centerPixelIframe = printCenterPixelColor()
+            mainSession.evaluateJS("document.getElementById('iframe').contentDocument.getElementById('print-button').click();")
             val orange = rgb(255, 113, 57)
             sessionRule.waitForResult(centerPixelIframe).let { it ->
                 assertTrue("The iframe should not print green. (Printed containing page instead of iframe.)", it != Color.GREEN)
@@ -301,7 +298,6 @@ class PrintDelegateTest : BaseSessionTest() {
         }
     }
 
-    @Ignore("https://bugzilla.mozilla.org/show_bug.cgi?id=1988041")
     @NullDelegate(Autofill.Delegate::class)
     @Test
     fun contentIframeWindowDotPrintTest() {
@@ -313,8 +309,8 @@ class PrintDelegateTest : BaseSessionTest() {
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
             // Main page window.print button
-            mainSession.evaluateJS("document.getElementById('print-button-page').click();")
             val centerPixelContent = printCenterPixelColor()
+            mainSession.evaluateJS("document.getElementById('print-button-page').click();")
             assertTrue("Printed the main content correctly.", sessionRule.waitForResult(centerPixelContent) == Color.GREEN)
         }
     }
@@ -328,8 +324,8 @@ class PrintDelegateTest : BaseSessionTest() {
             mainSession.waitForPageStop()
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
-            mainSession.printPageContent()
             val centerPixel = printCenterPixelColor()
+            mainSession.printPageContent()
             val orange = rgb(255, 113, 57)
             assertTrue(
                 "Android print opened and rendered.",
@@ -348,8 +344,8 @@ class PrintDelegateTest : BaseSessionTest() {
             // Setting to the default delegate (test rules changed it)
             mainSession.printDelegate = activity.view.printDelegate
             mainSession.setFocused(false)
-            mainSession.printPageContent()
             val centerPixel = printCenterPixelColor()
+            mainSession.printPageContent()
             val orange = rgb(255, 113, 57)
             assertTrue(
                 "Android print opened and rendered.",