Bug 903448 - Update testHistory for new about:home (r=margaret)
authorLucas Rocha <lucasr@mozilla.com>
Sat, 17 Aug 2013 14:24:27 +0100
changeset 151542 c0a78c5c8988c792b34b2259843e5aed7576b3a7
parent 151541 c67df6233bd1c9cf553fc6ddd5b37aad7219d45b
child 151543 59e82ad7b744ba45131f4393a2a1866a2d877c82
push idunknown
push userunknown
push dateunknown
reviewersmargaret
bugs903448
milestone26.0a1
Bug 903448 - Update testHistory for new about:home (r=margaret)
mobile/android/base/tests/robocop.ini
mobile/android/base/tests/testHistory.java.in
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -18,17 +18,17 @@
 [testPasswordProvider]
 # [testPasswordEncrypt] # see bug 824067
 [testFormHistory]
 [testBrowserProvider]
 [testSearchSuggestions]
 [testSharedPreferences]
 # [testThumbnails] # see bug 813107
 [testAddonManager]
-# [testHistory] # disabled on fig - bug 880060
+[testHistory]
 [testVkbOverlap]
 [testDoorHanger]
 [testTabHistory]
 [testShareLink]
 # [testClearPrivateData] # disabled on fig - bug 880060
 [testSettingsMenuItems]
 [testSystemPages]
 # [testPermissions] # see bug 757475
--- a/mobile/android/base/tests/testHistory.java.in
+++ b/mobile/android/base/tests/testHistory.java.in
@@ -25,19 +25,20 @@ public class testHistory extends AboutHo
 
         loadUrl(url);
         verifyPageTitle("Browser Blank Page 01");
         loadUrl(url2);
         verifyPageTitle("Browser Blank Page 02");
         loadUrl(url3);
         verifyPageTitle("Browser Blank Page 03");
 
-        /*  Removed by Bug 896576 - [fig] Remove [getHistoryList] from BaseTest
-        final ListView hList = getHistoryList("Today|Yesterday");
-        mAsserter.ok(hList != null, "checking history exists", "history exists");
+        openAboutHomeTab(AboutHomeTabs.MOST_RECENT);
+
+        final ListView hList = findListViewWithTag("most_recent");
+        mAsserter.is(waitForListToLoad(hList), true, "list is properly loaded");
 
         // Click on the history item and wait for the page to load
         // wait for the history list to be populated
         mFirstChild = null;
         boolean success = waitForTest(new BooleanTest() {
             @Override
             public boolean test() {
                 mFirstChild = hList.getChildAt(1);
@@ -60,16 +61,15 @@ public class testHistory extends AboutHo
                     return false;
                 }
                 return true;
             }
         }, MAX_WAIT_MS);
 
         mAsserter.isnot(mFirstChild, null, "Got history item");
         mSolo.clickOnView(mFirstChild);
-        */
 
         // The first item here (since it was just visited) should be a "Switch to tab" item
         // i.e. don't expect a DOMCOntentLoaded event
         verifyPageTitle("Browser Blank Page 03");
         verifyUrl(url3);
     }
 }