From caa54a233fb26b93631411dc7fd31338600f66bd Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 25 Oct 2012 15:37:39 -0400 Subject: [PATCH] bug 790102 - Frequent trobocheck, trobopan talosError: 'GeckoEventExpecter: blockForEvent timeout: Gecko:Ready [browser_output.txt]', use helper function to block for gecko:ready r=gbrown --- mobile/android/base/tests/testAboutPage.java.in | 2 +- mobile/android/base/tests/testAddonManager.java.in | 2 +- mobile/android/base/tests/testAllPagesTab.java.in | 2 +- mobile/android/base/tests/testAwesomebar.java.in | 2 +- mobile/android/base/tests/testAxisLocking.java.in | 2 +- mobile/android/base/tests/testBookmark.java.in | 2 +- mobile/android/base/tests/testBookmarklets.java.in | 2 +- mobile/android/base/tests/testBookmarksTab.java.in | 2 +- mobile/android/base/tests/testCheck.java.in | 2 +- mobile/android/base/tests/testCheck2.java.in | 2 +- mobile/android/base/tests/testCheck3.java.in | 2 +- mobile/android/base/tests/testFlingCorrectness.java.in | 2 +- mobile/android/base/tests/testFormHistory.java.in | 5 ++--- mobile/android/base/tests/testHistory.java.in | 2 +- mobile/android/base/tests/testHistoryTab.java.in | 2 +- mobile/android/base/tests/testLoad.java.in | 2 +- mobile/android/base/tests/testNewTab.java.in | 2 +- mobile/android/base/tests/testOverscroll.java.in | 2 +- mobile/android/base/tests/testPan.java.in | 2 +- mobile/android/base/tests/testPanCorrectness.java.in | 2 +- mobile/android/base/tests/testPasswordEncrypt.java.in | 3 +-- mobile/android/base/tests/testPasswordProvider.java.in | 3 +-- mobile/android/base/tests/testPermissions.java.in | 2 +- mobile/android/base/tests/testSearchSuggestions.java.in | 2 +- mobile/android/base/tests/testThumbnails.java.in | 2 +- mobile/android/base/tests/testWebContentContextMenu.java.in | 2 +- mobile/android/base/tests/test_bug720538.java.in | 2 +- 27 files changed, 28 insertions(+), 31 deletions(-) diff --git a/mobile/android/base/tests/testAboutPage.java.in b/mobile/android/base/tests/testAboutPage.java.in index 733a04391860..9e4d3bca741d 100644 --- a/mobile/android/base/tests/testAboutPage.java.in +++ b/mobile/android/base/tests/testAboutPage.java.in @@ -16,7 +16,7 @@ public class testAboutPage extends PixelTest { } public void testAboutPage() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // Load the about: page and verify its title String url = "about:"; diff --git a/mobile/android/base/tests/testAddonManager.java.in b/mobile/android/base/tests/testAddonManager.java.in index cd6a39e6a791..a0a4b26a94df 100755 --- a/mobile/android/base/tests/testAddonManager.java.in +++ b/mobile/android/base/tests/testAddonManager.java.in @@ -27,7 +27,7 @@ public class testAddonManager extends PixelTest { With the Addons Manager open the test will verify that when it is opened again from the menu no new tab will be opened*/ public void testAddonManager() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // Use the menu to open the Addon Manger selectMenuItem("Add-ons"); diff --git a/mobile/android/base/tests/testAllPagesTab.java.in b/mobile/android/base/tests/testAllPagesTab.java.in index 279377208a31..6e35d310a07f 100644 --- a/mobile/android/base/tests/testAllPagesTab.java.in +++ b/mobile/android/base/tests/testAllPagesTab.java.in @@ -41,7 +41,7 @@ public class testAllPagesTab extends BaseTest { } public void testAllPagesTab() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load one page so there is something in our history String url = getAbsoluteUrl("/robocop/robocop_big_link.html"); diff --git a/mobile/android/base/tests/testAwesomebar.java.in b/mobile/android/base/tests/testAwesomebar.java.in index ee634173d52b..f93db86c2399 100644 --- a/mobile/android/base/tests/testAwesomebar.java.in +++ b/mobile/android/base/tests/testAwesomebar.java.in @@ -10,7 +10,7 @@ public class testAwesomebar extends BaseTest { } public void testAwesomebar() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); String url = getAbsoluteUrl("/robocop/robocop_blank_01.html"); loadUrl(url); diff --git a/mobile/android/base/tests/testAxisLocking.java.in b/mobile/android/base/tests/testAxisLocking.java.in index 59650a57816c..b2eeac5c38cf 100644 --- a/mobile/android/base/tests/testAxisLocking.java.in +++ b/mobile/android/base/tests/testAxisLocking.java.in @@ -23,7 +23,7 @@ public class testAxisLocking extends PixelTest { MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop()); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load page and check we're at 0,0 loadAndVerifyBoxes(url); diff --git a/mobile/android/base/tests/testBookmark.java.in b/mobile/android/base/tests/testBookmark.java.in index b12d7ad59abc..712078be7cfc 100644 --- a/mobile/android/base/tests/testBookmark.java.in +++ b/mobile/android/base/tests/testBookmark.java.in @@ -74,7 +74,7 @@ public class testBookmark extends PixelTest { public void runAwesomeScreenTest() { final long PAINT_CLEAR_DELAY = 1000; // milliseconds - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // Open the bookmark list and check the root folder view ListView bookmarksList = openBookmarksList(); diff --git a/mobile/android/base/tests/testBookmarklets.java.in b/mobile/android/base/tests/testBookmarklets.java.in index 9ddc240d6a42..49bb52fcc8d0 100644 --- a/mobile/android/base/tests/testBookmarklets.java.in +++ b/mobile/android/base/tests/testBookmarklets.java.in @@ -21,7 +21,7 @@ public class testBookmarklets extends PixelTest { final String js = "javascript:alert(12 + .34)"; boolean alerted; - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load a standard page so bookmarklets work loadAndPaint(url); diff --git a/mobile/android/base/tests/testBookmarksTab.java.in b/mobile/android/base/tests/testBookmarksTab.java.in index d9d551421517..7b32bd9cc6f6 100644 --- a/mobile/android/base/tests/testBookmarksTab.java.in +++ b/mobile/android/base/tests/testBookmarksTab.java.in @@ -41,7 +41,7 @@ public class testBookmarksTab extends BaseTest { } public void testBookmarksTab() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); String url = "http://www.example.com"; // add one page to desktop folders so that we can see them diff --git a/mobile/android/base/tests/testCheck.java.in b/mobile/android/base/tests/testCheck.java.in index 4d19b2412fd8..c5ca63266f1f 100644 --- a/mobile/android/base/tests/testCheck.java.in +++ b/mobile/android/base/tests/testCheck.java.in @@ -20,7 +20,7 @@ public class testCheck extends PixelTest { public void testCheck() { String url = getAbsoluteUrl("/startup_test/fennecmark/timecube.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); loadAndPaint(url); diff --git a/mobile/android/base/tests/testCheck2.java.in b/mobile/android/base/tests/testCheck2.java.in index a27e661cd439..73701c23c44f 100644 --- a/mobile/android/base/tests/testCheck2.java.in +++ b/mobile/android/base/tests/testCheck2.java.in @@ -12,7 +12,7 @@ public class testCheck2 extends PixelTest { public void testCheck2() { String url = getAbsoluteUrl("/startup_test/fennecmark/cnn/cnn.com/index.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); loadAndPaint(url); mDriver.setupScrollHandling(); diff --git a/mobile/android/base/tests/testCheck3.java.in b/mobile/android/base/tests/testCheck3.java.in index 9fffcfea066f..f1b1d55cba0b 100644 --- a/mobile/android/base/tests/testCheck3.java.in +++ b/mobile/android/base/tests/testCheck3.java.in @@ -23,7 +23,7 @@ public class testCheck3 extends PixelTest { return; } - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); loadAndPaint(url); mDriver.setupScrollHandling(); diff --git a/mobile/android/base/tests/testFlingCorrectness.java.in b/mobile/android/base/tests/testFlingCorrectness.java.in index 3dd9afc63c14..9750d6da9337 100644 --- a/mobile/android/base/tests/testFlingCorrectness.java.in +++ b/mobile/android/base/tests/testFlingCorrectness.java.in @@ -21,7 +21,7 @@ public class testFlingCorrectness extends PixelTest { MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop()); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load page and check we're at 0,0 loadAndVerifyBoxes(url); diff --git a/mobile/android/base/tests/testFormHistory.java.in b/mobile/android/base/tests/testFormHistory.java.in index b7c1d2dab3b6..2b687865d055 100644 --- a/mobile/android/base/tests/testFormHistory.java.in +++ b/mobile/android/base/tests/testFormHistory.java.in @@ -33,9 +33,8 @@ public class testFormHistory extends BaseTest { ContentValues[] cvs = new ContentValues[1]; cvs[0] = new ContentValues(); - Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("Gecko:Ready"); - contentEventExpecter.blockForEvent(); - + blockForGeckoReady(); + Uri formHistoryUri; Uri insertUri; Uri expectedUri; diff --git a/mobile/android/base/tests/testHistory.java.in b/mobile/android/base/tests/testHistory.java.in index 46f56d6e5acf..427a39704dfb 100644 --- a/mobile/android/base/tests/testHistory.java.in +++ b/mobile/android/base/tests/testHistory.java.in @@ -19,7 +19,7 @@ public class testHistory extends PixelTest { } public void testHistory() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); String url = getAbsoluteUrl("/robocop/robocop_blank_01.html"); String url2 = getAbsoluteUrl("/robocop/robocop_blank_02.html"); diff --git a/mobile/android/base/tests/testHistoryTab.java.in b/mobile/android/base/tests/testHistoryTab.java.in index 56f7c0c52846..63f642089386 100644 --- a/mobile/android/base/tests/testHistoryTab.java.in +++ b/mobile/android/base/tests/testHistoryTab.java.in @@ -45,7 +45,7 @@ public class testHistoryTab extends PixelTest { } public void testHistoryTab() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // very approximate date-rollover detection Calendar cal = new GregorianCalendar(); diff --git a/mobile/android/base/tests/testLoad.java.in b/mobile/android/base/tests/testLoad.java.in index 26d7b080be4a..b95efa793912 100644 --- a/mobile/android/base/tests/testLoad.java.in +++ b/mobile/android/base/tests/testLoad.java.in @@ -18,7 +18,7 @@ public class testLoad extends PixelTest { public void testLoad() { String url = getAbsoluteUrl("/robocop/robocop_boxes.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); loadAndVerifyBoxes(url); diff --git a/mobile/android/base/tests/testNewTab.java.in b/mobile/android/base/tests/testNewTab.java.in index b9448c1a84c4..587b2226ac8d 100644 --- a/mobile/android/base/tests/testNewTab.java.in +++ b/mobile/android/base/tests/testNewTab.java.in @@ -23,7 +23,7 @@ public class testNewTab extends BaseTest { String url = getAbsoluteUrl("/robocop/robocop_blank_01.html"); String url2 = getAbsoluteUrl("/robocop/robocop_blank_02.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); Activity activity = getActivity(); tabCount = mDriver.findElement(activity, "tabs_count"); diff --git a/mobile/android/base/tests/testOverscroll.java.in b/mobile/android/base/tests/testOverscroll.java.in index e70c2f92ead5..77e810d25c03 100644 --- a/mobile/android/base/tests/testOverscroll.java.in +++ b/mobile/android/base/tests/testOverscroll.java.in @@ -21,7 +21,7 @@ public class testOverscroll extends PixelTest { MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop()); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load page and check we're at 0,0 loadAndVerifyBoxes(url); diff --git a/mobile/android/base/tests/testPan.java.in b/mobile/android/base/tests/testPan.java.in index 38b29a065baa..1fb87e30c915 100644 --- a/mobile/android/base/tests/testPan.java.in +++ b/mobile/android/base/tests/testPan.java.in @@ -17,7 +17,7 @@ public class testPan extends PixelTest { public void testPan() { String url = getAbsoluteUrl("/startup_test/fennecmark/wikipedia.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); loadAndPaint(url); diff --git a/mobile/android/base/tests/testPanCorrectness.java.in b/mobile/android/base/tests/testPanCorrectness.java.in index 321f25b28c4e..9d72d1bb4233 100644 --- a/mobile/android/base/tests/testPanCorrectness.java.in +++ b/mobile/android/base/tests/testPanCorrectness.java.in @@ -21,7 +21,7 @@ public class testPanCorrectness extends PixelTest { MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop()); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load page and check we're at 0,0 loadAndVerifyBoxes(url); diff --git a/mobile/android/base/tests/testPasswordEncrypt.java.in b/mobile/android/base/tests/testPasswordEncrypt.java.in index e155a1c411e3..c9102ef22c39 100644 --- a/mobile/android/base/tests/testPasswordEncrypt.java.in +++ b/mobile/android/base/tests/testPasswordEncrypt.java.in @@ -27,8 +27,7 @@ public class testPasswordEncrypt extends BaseTest { mAsserter.isnot(cr, null, "Found a content resolver"); ContentValues cvs = new ContentValues(); - Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("Gecko:Ready"); - contentEventExpecter.blockForEvent(); + blockForGeckoReady(); File db = new File(mProfile, "signons.sqlite"); String dbPath = db.getPath(); diff --git a/mobile/android/base/tests/testPasswordProvider.java.in b/mobile/android/base/tests/testPasswordProvider.java.in index 9ace65b6a29b..9cde6f5fb5bf 100644 --- a/mobile/android/base/tests/testPasswordProvider.java.in +++ b/mobile/android/base/tests/testPasswordProvider.java.in @@ -31,8 +31,7 @@ public class testPasswordProvider extends BaseTest { ContentValues[] cvs = new ContentValues[1]; cvs[0] = new ContentValues(); - Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("Gecko:Ready"); - contentEventExpecter.blockForEvent(); + blockForGeckoReady(); Uri passwordUri; try { diff --git a/mobile/android/base/tests/testPermissions.java.in b/mobile/android/base/tests/testPermissions.java.in index 69cd3612ae6e..f141fa5113ab 100644 --- a/mobile/android/base/tests/testPermissions.java.in +++ b/mobile/android/base/tests/testPermissions.java.in @@ -15,7 +15,7 @@ public class testPermissions extends PixelTest { } public void testPermissions() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); geolocationTest(); } diff --git a/mobile/android/base/tests/testSearchSuggestions.java.in b/mobile/android/base/tests/testSearchSuggestions.java.in index a9f5aeb8d593..86d7356aa2f6 100644 --- a/mobile/android/base/tests/testSearchSuggestions.java.in +++ b/mobile/android/base/tests/testSearchSuggestions.java.in @@ -33,7 +33,7 @@ public class testSearchSuggestions extends BaseTest { } public void testSearchSuggestions() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // Map of expected values. See robocop_suggestions.sjs. final HashMap> suggestMap = new HashMap>(); diff --git a/mobile/android/base/tests/testThumbnails.java.in b/mobile/android/base/tests/testThumbnails.java.in index 805fb365bc68..4ecb3da43008 100644 --- a/mobile/android/base/tests/testThumbnails.java.in +++ b/mobile/android/base/tests/testThumbnails.java.in @@ -45,7 +45,7 @@ public class testThumbnails extends BaseTest { // should be plenty of time, even on slow devices final int thumbnailDelay = 3000; - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); // load sites; both will return HTTP 200 with a green background loadUrl(site1Url); diff --git a/mobile/android/base/tests/testWebContentContextMenu.java.in b/mobile/android/base/tests/testWebContentContextMenu.java.in index 9db03e4adde5..bd4f5e7d6e9d 100644 --- a/mobile/android/base/tests/testWebContentContextMenu.java.in +++ b/mobile/android/base/tests/testWebContentContextMenu.java.in @@ -16,7 +16,7 @@ public class testWebContentContextMenu extends PixelTest { } public void testWebContentContextMenu() { - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); DisplayMetrics dm = new DisplayMetrics(); getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm); diff --git a/mobile/android/base/tests/test_bug720538.java.in b/mobile/android/base/tests/test_bug720538.java.in index 21b2730e685c..35b0e9786335 100644 --- a/mobile/android/base/tests/test_bug720538.java.in +++ b/mobile/android/base/tests/test_bug720538.java.in @@ -13,7 +13,7 @@ public class test_bug720538 extends PixelTest { public void test_bug720538() { String url = getAbsoluteUrl("/robocop/test_bug720538.html"); - mActions.expectGeckoEvent("Gecko:Ready").blockForEvent(); + blockForGeckoReady(); /* * for this test, we load the associated test_bug720538.html file. this file has two