Bug 1220928 - Update test references to old history panel. r=sebastian
authorChenxia Liu <liuche@mozilla.com>
Wed, 30 Mar 2016 17:32:11 -0700
changeset 291332 af73f5dcd1b1d8f13fbf718b223a0e546b8498ff
parent 291331 251bd4b73f611357597860acc356d665d5ffcf95
child 291333 4317688957ef27ba4a9c005127f08b1fc07b281a
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1220928
milestone48.0a1
Bug 1220928 - Update test references to old history panel. r=sebastian MozReview-Commit-ID: 6A2ukiEcBO8
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/components/AboutHomeComponent.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testAboutHomeVisibility.java
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/components/AboutHomeComponent.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/components/AboutHomeComponent.java
@@ -29,18 +29,17 @@ import com.robotium.solo.Solo;
  * A class representing any interactions that take place on the Awesomescreen.
  */
 public class AboutHomeComponent extends BaseComponent {
     private static final String LOGTAG = AboutHomeComponent.class.getSimpleName();
 
     private static final List<PanelType> PANEL_ORDERING = Arrays.asList(
             PanelType.TOP_SITES,
             PanelType.BOOKMARKS,
-            PanelType.HISTORY,
-            PanelType.REMOTE_TABS,
+            PanelType.COMBINED_HISTORY,
             PanelType.RECENT_TABS,
             PanelType.READING_LIST
     );
 
     // The percentage of the panel to swipe between 0 and 1. This value was set through
     // testing: 0.55f was tested on try and fails on armv6 devices.
     private static final float SWIPE_PERCENTAGE = 0.70f;
 
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testAboutHomeVisibility.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testAboutHomeVisibility.java
@@ -45,13 +45,13 @@ public class testAboutHomeVisibility ext
         mToolbar.assertTitle(mStringHelper.ABOUT_HOME_URL);
         mAboutHome.assertVisible()
                   .assertCurrentPanel(PanelType.TOP_SITES);
 
         // We can navigate to about:home panels by panel UUID.
         mAboutHome.navigateToBuiltinPanelType(PanelType.BOOKMARKS)
                   .assertVisible()
                   .assertCurrentPanel(PanelType.BOOKMARKS);
-        mAboutHome.navigateToBuiltinPanelType(PanelType.HISTORY)
+        mAboutHome.navigateToBuiltinPanelType(PanelType.COMBINED_HISTORY)
                   .assertVisible()
-                  .assertCurrentPanel(PanelType.HISTORY);
+                  .assertCurrentPanel(PanelType.COMBINED_HISTORY);
     }
 }