Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret
authorGeoff Brown <gbrown@mozilla.com>
Wed, 12 Mar 2014 09:42:00 -0600
changeset 173192 be7f5af57b93262e0bf77e62bd170488cc688776
parent 173191 b2ff3a685198fbb801f321acb9ba95972e4039ef
child 173193 18f03bfc658ec98442954a888e2922beeac0aaea
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmargaret
bugs979612
milestone30.0a1
Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret
mobile/android/base/tests/robocop.ini
mobile/android/base/tests/testPictureLinkContextMenu.java
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -65,18 +65,16 @@ skip-if = android_version == "10"
 [testOverscroll]
 [testPanCorrectness]
 # disabled on x86 only; bug 927476
 skip-if = processor == "x86"
 # [testPasswordEncrypt] # see bug 824067
 [testPasswordProvider]
 # [testPermissions] # see bug 757475
 [testPictureLinkContextMenu]
-# disabled on Android 2.3; bug 979612
-skip-if = android_version == "10"
 [testPrefsObserver]
 [testPrivateBrowsing]
 [testPromptGridInput]
 # disabled on x86 only; bug 957185
 skip-if = processor == "x86"
 # [testReaderMode] # see bug 913254, 936224
 [testReadingListProvider]
 [testSearchSuggestions]
--- a/mobile/android/base/tests/testPictureLinkContextMenu.java
+++ b/mobile/android/base/tests/testPictureLinkContextMenu.java
@@ -15,18 +15,18 @@ public class testPictureLinkContextMenu 
         return TEST_MOCHITEST;
     }
 
     public void testPictureLinkContextMenu() {
         blockForGeckoReady();
 
         PICTURE_PAGE_URL=getAbsoluteUrl("/robocop/robocop_picture_link.html");
         BLANK_PAGE_URL=getAbsoluteUrl("/robocop/robocop_blank_02.html");
-        inputAndLoadUrl(PICTURE_PAGE_URL);
-        waitForText(PICTURE_PAGE_TITLE);
+        loadAndPaint(PICTURE_PAGE_URL);
+        verifyPageTitle(PICTURE_PAGE_TITLE);
 
         verifyContextMenuItems(photoMenuItems);
         verifyCopyOption(photoMenuItems[0], "Firefox.jpg"); // Test the "Copy Image Location" option
         verifyShareOption(photoMenuItems[1], PICTURE_PAGE_TITLE); // Test the "Share Image" option
         openTabFromContextMenu(photoMenuItems[4],2); // Test the "Open in New Tab" option - expecting 2 tabs: the original and the new one
         openTabFromContextMenu(photoMenuItems[5],2); // Test the "Open in Private Tab" option - expecting only 2 tabs in normal mode
         verifyCopyOption(photoMenuItems[6], BLANK_PAGE_URL); // Test the "Copy Link" option
         verifyShareOption(photoMenuItems[7], PICTURE_PAGE_TITLE); // Test the "Share Link" option