API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 30th, 2014
38
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 53.31 KB | None | 0 0
raw download clone embed print report
  1. diff -r b227a707080f mobile/android/base/tests/PixelTest.java
  2. --- a/mobile/android/base/tests/PixelTest.java  Wed Apr 30 13:15:46 2014 -0400
  3. +++ b/mobile/android/base/tests/PixelTest.java  Wed Apr 30 19:51:24 2014 -0700
  4. @@ -29,8 +29,8 @@
  5.          Actions.RepeatedEventExpecter paintExpecter = mActions.expectPaint();
  6.  
  7.          mActions.sendSpecialKey(Actions.SpecialKey.MENU);
  8. -        waitForText("Reload");
  9. -        mSolo.clickOnText("Reload");
  10. +        waitForText(StringHelper.RELOAD_LABEL);
  11. +        mSolo.clickOnText(StringHelper.RELOAD_LABEL);
  12.  
  13.          paintExpecter.blockUntilClear(PAINT_CLEAR_DELAY);
  14.          paintExpecter.unregisterListener();
  15. diff -r b227a707080f mobile/android/base/tests/SessionTest.java
  16. --- a/mobile/android/base/tests/SessionTest.java    Wed Apr 30 13:15:46 2014 -0400
  17. +++ b/mobile/android/base/tests/SessionTest.java    Wed Apr 30 19:51:24 2014 -0700
  18. @@ -132,7 +132,7 @@
  19.      protected void loadSessionTabs(Session session) {
  20.          // Verify initial about:home tab
  21.          verifyTabCount(1);
  22. -        verifyUrl("about:home");
  23. +        verifyUrl(StringHelper.ABOUT_HOME_URL);
  24.  
  25.          SessionTab[] tabs = session.getItems();
  26.          for (int i = 0; i < tabs.length; i++) {
  27. @@ -141,7 +141,7 @@
  28.  
  29.              // New tabs always start with about:home, so make sure about:home
  30.              // is always the first entry.
  31. -            mAsserter.is(pages[0].url, "about:home", "first page in tab is about:home");
  32. +            mAsserter.is(pages[0].url, StringHelper.ABOUT_HOME_URL, "first page in tab is about:home");
  33.  
  34.              // If this is the first tab, the tab already exists, so no need to
  35.              // create a new one. Otherwise, create a new tab if we're loading
  36. @@ -194,7 +194,7 @@
  37.                  (new NavigationWalker<PageInfo>(tab) {
  38.                      @Override
  39.                      public void onItem(PageInfo page, int currentIndex) {
  40. -                        if (page.url.equals("about:home")) {
  41. +                        if (page.url.equals(StringHelper.ABOUT_HOME_URL)) {
  42.                              waitForText("Enter Search or Address");
  43.                              verifyUrl(page.url);
  44.                          } else {
  45. diff -r b227a707080f mobile/android/base/tests/StringHelper.java
  46. --- a/mobile/android/base/tests/StringHelper.java   Wed Apr 30 13:15:46 2014 -0400
  47. +++ b/mobile/android/base/tests/StringHelper.java   Wed Apr 30 19:51:24 2014 -0700
  48. @@ -18,44 +18,63 @@
  49.      // About pages
  50.      public static final String ABOUT_BLANK_URL = "about:blank";
  51.      public static final String ABOUT_FIREFOX_URL = "about:firefox";
  52. +    public static final String ABOUT_RIGHTS_URL = "about:rights";
  53. +    public static final String ABOUT_BUILDCONFIG_URL = "about:buildconfig";
  54. +    public static final String ABOUT_HEALTHREPORT_URL = "about:healthreport";
  55.      public static final String ABOUT_DOWNLOADS_URL = "about:downloads";
  56.      public static final String ABOUT_HOME_URL = "about:home";
  57.      public static final String ABOUT_ADDONS_URL = "about:addons";
  58.      public static final String ABOUT_APPS_URL = "about:apps";
  59. +    public static final String ABOUT_ABOUT_URL = "about:about";
  60. +    public static final String ABOUT_URL = "about:";
  61.  
  62.      // About pages' titles
  63.      public static final String ABOUT_HOME_TITLE = "";
  64.  
  65. +    // Context Menu item strings
  66. +    public static final CONTEXT_MENU_BOOKMARK_LINK = "Bookmark Link";
  67. +    public static final CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB = "Open Link in New Tab";
  68. +    public static final CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB = "Open Link in Private Tab";
  69. +    public static final CONTEXT_MENU_COPY_LINK = "Copy Link";
  70. +    public static final CONTEXT_MENU_SHARE_LINK = "Share Link";
  71. +    public static final CONTEXT_MENU_BOOKMARK_LINK = "Bookmark Link";
  72. +    public static final CONTEXT_MENU_EDIT = "Edit";
  73. +    public static final CONTEXT_MENU_SHARE = "Share";
  74. +    public static final CONTEXT_MENU_REMOVE = "Remove";
  75. +    public static final CONTEXT_MENU_COPY_ADDRESS = "Copy Address";
  76. +    public static final CONTEXT_MENU_EDIT_SITE_SETTINGS = "Edit Site Settings";
  77. +    public static final CONTEXT_MENU_ADD_TO_HOME_SCREEN = "Add to Home Screen";
  78. +
  79.      // Context Menu menu items
  80.      public static final String[] CONTEXT_MENU_ITEMS_IN_PRIVATE_TAB = new String[] {
  81. -        "Open Link in Private Tab",
  82. -        "Copy Link",
  83. -        "Share Link",
  84. -        "Bookmark Link"
  85. +        CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB,
  86. +        CONTEXT_MENU_COPY_LINK,
  87. +        CONTEXT_MENU_SHARE_LINK,
  88. +        CONTEXT_MENU_BOOKMARK_LINK
  89.      };
  90.  
  91.      public static final String[] CONTEXT_MENU_ITEMS_IN_NORMAL_TAB = new String[] {
  92. -        "Open Link in New Tab",
  93. -        "Open Link in Private Tab",
  94. -        "Copy Link",
  95. -        "Share Link",
  96. -        "Bookmark Link"
  97. +        CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB,
  98. +        CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB,
  99. +        CONTEXT_MENU_COPY_LINK,
  100. +        CONTEXT_MENU_SHARE_LINK,
  101. +        CONTEXT_MENU_BOOKMARK_LINK
  102.      };
  103.  
  104.      public static final String[] BOOKMARK_CONTEXT_MENU_ITEMS = new String[] {
  105. -        "Open in New Tab",
  106. -        "Open in Private Tab",
  107. -        "Edit",
  108. -        "Remove",
  109. -        "Share",
  110. -        "Add to Home Screen"
  111. +        CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB,
  112. +        CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB,
  113. +        CONTEXT_MENU_EDIT,
  114. +        CONTEXT_MENU_REMOVE,
  115. +        CONTEXT_MENU_SHARE,
  116. +        CONTEXT_MENU_ADD_TO_HOME_SCREEN
  117.      };
  118.  
  119.      public static final String[] CONTEXT_MENU_ITEMS_IN_URL_BAR = new String[] {
  120. -        "Share",
  121. -        "Copy Address",
  122. -        "Edit Site Settings",
  123. -        "Add to Home Screen"
  124. +        CONTEXT_MENU_SHARE,
  125. +        CONTEXT_MENU_COPY_ADDRESS,
  126. +        CONTEXT_MENU_EDIT_SITE_SETTINGS,
  127. +        CONTEXT_MENU_ADD_TO_HOME_SCREEN
  128.      };
  129.  
  130.      public static final String TITLE_PLACE_HOLDER = "Enter Search or Address";
  131. @@ -67,6 +86,8 @@
  132.      public static final String ROBOCOP_BLANK_PAGE_01_URL = "/robocop/robocop_blank_01.html";
  133.      public static final String ROBOCOP_BLANK_PAGE_02_URL = "/robocop/robocop_blank_02.html";
  134.      public static final String ROBOCOP_BLANK_PAGE_03_URL = "/robocop/robocop_blank_03.html";
  135. +    public static final String ROBOCOP_BLANK_PAGE_04_URL = "/robocop/robocop_blank_04.html";
  136. +    public static final String ROBOCOP_BLANK_PAGE_05_URL = "/robocop/robocop_blank_05.html";
  137.      public static final String ROBOCOP_BOXES_URL = "/robocop/robocop_boxes.html";
  138.      public static final String ROBOCOP_GEOLOCATION_URL = "/robocop/robocop_geolocation.html";
  139.      public static final String ROBOCOP_LOGIN_URL = "/robocop/robocop_login.html";
  140. @@ -84,6 +105,8 @@
  141.      public static final String ROBOCOP_BLANK_PAGE_01_TITLE = "Browser Blank Page 01";
  142.      public static final String ROBOCOP_BLANK_PAGE_02_TITLE = "Browser Blank Page 02";
  143.      public static final String ROBOCOP_BLANK_PAGE_03_TITLE = "Browser Blank Page 03";
  144. +    public static final String ROBOCOP_BLANK_PAGE_04_TITLE = "Browser Blank Page 04";
  145. +    public static final String ROBOCOP_BLANK_PAGE_05_TITLE = "Browser Blank Page 05";
  146.      public static final String ROBOCOP_BOXES_TITLE = "Browser Box test";
  147.      public static final String ROBOCOP_GEOLOCATION_TITLE = "Geolocation Test Page";
  148.      public static final String ROBOCOP_LOGIN_TITLE = "Robocop Login";
  149. @@ -123,16 +146,17 @@
  150.      public static final String TRACKING_LABEL = "Tracking";
  151.      public static final String COOKIES_LABEL = "Cookies";
  152.      public static final String REMEMBER_PASSWORDS_LABEL = "Remember passwords";
  153. -    public static final String MASTER_PASWSWORD_LABEL = "Use master password";
  154. +    public static final String MASTER_PASSWORD_LABEL = "Use master password";
  155.      public static final String CLEAR_PRIVATE_DATA_LABEL = "Clear private data";
  156.  
  157.      // Mozilla
  158. -    public static final String ABOUT_LABEL = "About (Fennec|Nightly|Aurora|Firefox Beta|Firefox)";
  159. +    public static final String BRAND_NAME = "(Fennec|Nightly|Aurora|Firefox Beta|Firefox)";
  160. +    public static final String ABOUT_LABEL = "About " + BRAND_NAME;
  161.      public static final String FAQS_LABEL = "FAQs";
  162.      public static final String FEEDBACK_LABEL = "Give feedback";
  163.      public static final String PRODUCT_ANNOUNCEMENTS_LABEL = "Show product announcements";
  164.      public static final String LOCATION_SERVICES_LABEL = "Mozilla location services";
  165. -    public static final String HELTH_REPORT_LABEL = "(Fennec|Nightly|Aurora|Firefox Beta|Firefox) Health Report";
  166. +    public static final String HELTH_REPORT_LABEL = BRAND_NAME + " Health Report";
  167.      public static final String MY_HEALTH_REPORT_LABEL = "View my Health Report";
  168.  
  169.      // Developer tools
  170. diff -r b227a707080f mobile/android/base/tests/testAboutPage.java
  171. --- a/mobile/android/base/tests/testAboutPage.java  Wed Apr 30 13:15:46 2014 -0400
  172. +++ b/mobile/android/base/tests/testAboutPage.java  Wed Apr 30 19:51:24 2014 -0700
  173. @@ -22,20 +22,20 @@
  174.          String url = "about:";
  175.          loadAndPaint(url);
  176.  
  177. -        ensureTitleMatches("About (Fennec|Nightly|Aurora|Firefox|Firefox Beta)");
  178. +        ensureTitleMatches(StringHelper.ABOUT_LABEL);
  179.  
  180.          // Open a new page to remove the about: page from the current tab.
  181. -        url = getAbsoluteUrl("/robocop/robocop_blank_01.html");
  182. +        url = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  183.          inputAndLoadUrl(url);
  184.  
  185.          // At this point the page title should have been set.
  186. -        ensureTitleMatches("Browser Blank Page 01");
  187. +        ensureTitleMatches(StringHelper.ROBOCOP_BLANK_PAGE_01_TITLE);
  188.  
  189.          // Set up listeners to catch the page load we're about to do.
  190.          Actions.EventExpecter tabEventExpecter = mActions.expectGeckoEvent("Tab:Added");
  191.          Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("DOMContentLoaded");
  192.  
  193. -        selectSettingsItem("Mozilla", "About (Fennec|Nightly|Aurora|Firefox|Firefox Beta)");
  194. +        selectSettingsItem(StringHelper.MOZILLA_SECTION_LABEL, StringHelper.ABOUT_LABEL);
  195.  
  196.          // Wait for the new tab and page to load
  197.          tabEventExpecter.blockForEvent();
  198. @@ -45,6 +45,6 @@
  199.          contentEventExpecter.unregisterListener();
  200.  
  201.          // Grab the title to make sure the about: page was loaded.
  202. -        ensureTitleMatches("About (Fennec|Nightly|Aurora|Firefox|Firefox Beta)");
  203. +        ensureTitleMatches(StringHelper.ABOUT_LABEL);
  204.      }
  205.  }
  206. diff -r b227a707080f mobile/android/base/tests/testAddonManager.java
  207. --- a/mobile/android/base/tests/testAddonManager.java   Wed Apr 30 13:15:46 2014 -0400
  208. +++ b/mobile/android/base/tests/testAddonManager.java   Wed Apr 30 19:51:24 2014 -0700
  209. @@ -15,12 +15,12 @@
  210.      public void testAddonManager() {
  211.          Actions.EventExpecter tabEventExpecter;
  212.          Actions.EventExpecter contentEventExpecter;
  213. -        String url = "about:addons";
  214. +        String url = StringHelper.ABOUT_ADDONS_URL;
  215.  
  216.          blockForGeckoReady();
  217.  
  218.          // Use the menu to open the Addon Manger
  219. -        selectMenuItem("Add-ons");
  220. +        selectMenuItem(StringHelper.ADDONS_LABEL);
  221.  
  222.          // Set up listeners to catch the page load we're about to do
  223.          tabEventExpecter = mActions.expectGeckoEvent("Tab:Added");
  224. @@ -34,21 +34,21 @@
  225.          contentEventExpecter.unregisterListener();
  226.  
  227.          // Verify the url
  228. -        verifyPageTitle("Add-ons");
  229. +        verifyPageTitle(StringHelper.ADDONS_LABEL);
  230.  
  231.          // Close the Add-on Manager
  232.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  233.  
  234.          // Load the about:addons page and verify it was loaded
  235.          loadAndPaint(url);
  236. -        verifyPageTitle("Add-ons");
  237. +        verifyPageTitle(StringHelper.ADDONS_LABEL);
  238.  
  239.          // Change the AMO URL so we do not try to navigate to a live webpage
  240.          JSONObject jsonPref = new JSONObject();
  241.          try {
  242.              jsonPref.put("name", "extensions.getAddons.browseAddons");
  243.              jsonPref.put("type", "string");
  244. -            jsonPref.put("value", getAbsoluteUrl("/robocop/robocop_blank_01.html"));
  245. +            jsonPref.put("value", getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL));
  246.              setPreferenceAndWaitForChange(jsonPref);
  247.  
  248.          } catch (Exception ex) {
  249. @@ -83,10 +83,10 @@
  250.          verifyTabCount(2);
  251.  
  252.          // Verify the page was opened
  253. -        verifyPageTitle("Browser Blank Page 01");
  254. +        verifyPageTitle(StringHelper.ROBOCOP_BLANK_PAGE_01_TITLE);
  255.  
  256.          // Addons Manager is not opened 2 separate times when opened from the menu
  257. -        selectMenuItem("Add-ons");        
  258. +        selectMenuItem(StringHelper.ADDONS_LABEL);        
  259.  
  260.          // Verify tab count not increased
  261.          verifyTabCount(2);
  262. diff -r b227a707080f mobile/android/base/tests/testAwesomebar.java
  263. --- a/mobile/android/base/tests/testAwesomebar.java Wed Apr 30 13:15:46 2014 -0400
  264. +++ b/mobile/android/base/tests/testAwesomebar.java Wed Apr 30 19:51:24 2014 -0700
  265. @@ -4,7 +4,7 @@
  266.      public void testAwesomebar() {
  267.          blockForGeckoReady();
  268.  
  269. -        String url = getAbsoluteUrl("/robocop/robocop_blank_01.html");
  270. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  271.          inputAndLoadUrl(url);
  272.  
  273.          mDriver.setupScrollHandling();
  274. diff -r b227a707080f mobile/android/base/tests/testAxisLocking.java
  275. --- a/mobile/android/base/tests/testAxisLocking.java    Wed Apr 30 13:15:46 2014 -0400
  276. +++ b/mobile/android/base/tests/testAxisLocking.java    Wed Apr 30 19:51:24 2014 -0700
  277. @@ -13,7 +13,7 @@
  278.   */
  279.  public class testAxisLocking extends PixelTest {
  280.      public void testAxisLocking() {
  281. -        String url = getAbsoluteUrl("/robocop/robocop_boxes.html");
  282. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BOXES_URL);
  283.  
  284.          MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
  285.  
  286. diff -r b227a707080f mobile/android/base/tests/testBookmarksPanel.java
  287. --- a/mobile/android/base/tests/testBookmarksPanel.java Wed Apr 30 13:15:46 2014 -0400
  288. +++ b/mobile/android/base/tests/testBookmarksPanel.java Wed Apr 30 19:51:24 2014 -0700
  289. @@ -51,7 +51,7 @@
  290.          // Test that "Remove" works
  291.          openBookmarkContextMenu(editedBookmarkValues[1]);
  292.          mSolo.clickOnText(StringHelper.BOOKMARK_CONTEXT_MENU_ITEMS[3]);
  293. -        waitForText("Bookmark removed");
  294. +        waitForText(StringHelper.BOOKMARK_REMOVED_LABEL);
  295.          mAsserter.ok(!mDatabaseHelper.isBookmark(editedBookmarkValues[1]), "Checking that the bookmark was removed", "The bookmark was removed");
  296.      }
  297.  
  298. @@ -61,7 +61,7 @@
  299.      */
  300.      private void editBookmark(String bookmarkUrl, String[] values) {
  301.          openBookmarkContextMenu(bookmarkUrl);
  302. -        mSolo.clickOnText("Edit");
  303. +        mSolo.clickOnText(StringHelper.BOOKMARK_CONTEXT_MENU_ITEMS[2]);
  304.          waitForText("Edit Bookmark");
  305.  
  306.          // Update the fields with the new values
  307. @@ -72,7 +72,7 @@
  308.          }
  309.  
  310.          mSolo.clickOnButton("OK");
  311. -        waitForText("Bookmark updated");
  312. +        waitForText(StringHelper.BOOKMARK_UPDATED_LABEL);
  313.      }
  314.  
  315.     /**
  316. @@ -81,7 +81,7 @@
  317.      */
  318.      private void checkBookmarkEdit(String bookmarkUrl, String[] values) {
  319.          openBookmarkContextMenu(bookmarkUrl);
  320. -        mSolo.clickOnText("Edit");
  321. +        mSolo.clickOnText(StringHelper.BOOKMARK_CONTEXT_MENU_ITEMS[2]);
  322.          waitForText("Edit Bookmark");
  323.  
  324.          // Check the values of the fields
  325. @@ -90,6 +90,6 @@
  326.          }
  327.  
  328.          mSolo.clickOnButton("Cancel");
  329. -        waitForText("BOOKMARKS");
  330. +        waitForText(StringHelper.BOOKMARKS_LABEL);
  331.      }
  332.  }
  333. diff -r b227a707080f mobile/android/base/tests/testDoorHanger.java
  334. --- a/mobile/android/base/tests/testDoorHanger.java Wed Apr 30 13:15:46 2014 -0400
  335. +++ b/mobile/android/base/tests/testDoorHanger.java Wed Apr 30 19:51:24 2014 -0700
  336. @@ -14,10 +14,10 @@
  337.  */
  338.  public class testDoorHanger extends BaseTest {
  339.      public void testDoorHanger() {
  340. -        String GEO_URL = getAbsoluteUrl("/robocop/robocop_geolocation.html");
  341. -        String BLANK_URL = getAbsoluteUrl("/robocop/robocop_blank_01.html");
  342. -        String OFFLINE_STORAGE_URL = getAbsoluteUrl("/robocop/robocop_offline_storage.html");
  343. -        String LOGIN_URL = getAbsoluteUrl("/robocop/robocop_login.html");
  344. +        String GEO_URL = getAbsoluteUrl(StringHelper.ROBOCOP_GEOLOCATION_URL);
  345. +        String BLANK_URL = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  346. +        String OFFLINE_STORAGE_URL = getAbsoluteUrl(StringHelper.ROBOCOP_OFFLINE_STORAGE_URL);
  347. +        String LOGIN_URL = getAbsoluteUrl(StringHelper.ROBOCOP_LOGIN_URL);
  348.  
  349.          // Strings used in doorhanger messages and buttons
  350.          String GEO_MESSAGE = "Share your location with";
  351. diff -r b227a707080f mobile/android/base/tests/testFindInPage.java
  352. --- a/mobile/android/base/tests/testFindInPage.java Wed Apr 30 13:15:46 2014 -0400
  353. +++ b/mobile/android/base/tests/testFindInPage.java Wed Apr 30 19:51:24 2014 -0700
  354. @@ -12,7 +12,7 @@
  355.  
  356.      public void testFindInPage() {
  357.          blockForGeckoReady();
  358. -        String url = getAbsoluteUrl("/robocop/robocop_text_page.html");
  359. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_TEXT_PAGE_URL);
  360.          loadAndPaint(url);
  361.  
  362.          // Select the upper left corner of the screen
  363. @@ -45,7 +45,7 @@
  364.      }
  365.  
  366.      public void findText(String text, int nrOfMatches){
  367. -        selectMenuItem("Find in Page");
  368. +        selectMenuItem(StringHelper.FIND_IN_PAGE_LABEL);
  369.          close = mDriver.findElement(getActivity(), R.id.find_close);
  370.          boolean success = waitForTest ( new BooleanTest() {
  371.              public boolean test() {
  372. diff -r b227a707080f mobile/android/base/tests/testFlingCorrectness.java
  373. --- a/mobile/android/base/tests/testFlingCorrectness.java   Wed Apr 30 13:15:46 2014 -0400
  374. +++ b/mobile/android/base/tests/testFlingCorrectness.java   Wed Apr 30 19:51:24 2014 -0700
  375. @@ -11,7 +11,7 @@
  376.   */
  377.  public class testFlingCorrectness extends PixelTest {
  378.      public void testFlingCorrectness() {
  379. -        String url = getAbsoluteUrl("/robocop/robocop_boxes.html");
  380. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BOXES_URL);
  381.  
  382.          MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
  383.  
  384. diff -r b227a707080f mobile/android/base/tests/testHistory.java
  385. --- a/mobile/android/base/tests/testHistory.java    Wed Apr 30 13:15:46 2014 -0400
  386. +++ b/mobile/android/base/tests/testHistory.java    Wed Apr 30 19:51:24 2014 -0700
  387. @@ -10,16 +10,16 @@
  388.      public void testHistory() {
  389.          blockForGeckoReady();
  390.  
  391. -        String url = getAbsoluteUrl("/robocop/robocop_blank_01.html");
  392. -        String url2 = getAbsoluteUrl("/robocop/robocop_blank_02.html");
  393. -        String url3 = getAbsoluteUrl("/robocop/robocop_blank_03.html");
  394. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  395. +        String url2 = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_02_URL);
  396. +        String url3 = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_03_URL);
  397.  
  398.          inputAndLoadUrl(url);
  399. -        verifyPageTitle("Browser Blank Page 01");
  400. +        verifyPageTitle(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  401.          inputAndLoadUrl(url2);
  402. -        verifyPageTitle("Browser Blank Page 02");
  403. +        verifyPageTitle(StringHelper.ROBOCOP_BLANK_PAGE_02_URL);
  404.          inputAndLoadUrl(url3);
  405. -        verifyPageTitle("Browser Blank Page 03");
  406. +        verifyPageTitle(StringHelper.ROBOCOP_BLANK_PAGE_03_URL);
  407.  
  408.          openAboutHomeTab(AboutHomeTabs.MOST_RECENT);
  409.  
  410. @@ -60,7 +60,7 @@
  411.  
  412.          // The first item here (since it was just visited) should be a "Switch to tab" item
  413.          // i.e. don't expect a DOMCOntentLoaded event
  414. -        verifyPageTitle("Browser Blank Page 03");
  415. +        verifyPageTitle(StringHelper.ROBOCOP_BLANK_PAGE_03_URL);
  416.          verifyUrl(url3);
  417.      }
  418.  }
  419. diff -r b227a707080f mobile/android/base/tests/testHomeBanner.java
  420. --- a/mobile/android/base/tests/testHomeBanner.java Wed Apr 30 13:15:46 2014 -0400
  421. +++ b/mobile/android/base/tests/testHomeBanner.java Wed Apr 30 19:51:24 2014 -0700
  422. @@ -41,7 +41,7 @@
  423.          // Load about:home and make sure the onshown handler is called.
  424.          Actions.EventExpecter eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageShown");
  425.          addBannerMessage();
  426. -        NavigationHelper.enterAndLoadUrl("about:home");
  427. +        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  428.          eventExpecter.blockForEvent();
  429.  
  430.          // Verify that the banner is visible with the correct text.
  431. @@ -53,7 +53,7 @@
  432.          eventExpecter.blockForEvent();
  433.  
  434.          // Verify that the banner isn't visible after navigating away from about:home.
  435. -        NavigationHelper.enterAndLoadUrl("about:firefox");
  436. +        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_FIREFOX_URL);
  437.  
  438.          mAboutHome.assertBannerNotVisible();
  439.      }
  440. @@ -68,7 +68,7 @@
  441.          removeBannerMessage();
  442.  
  443.          // Verify that the banner no longer appears.
  444. -        NavigationHelper.enterAndLoadUrl("about:home");
  445. +        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  446.          mAboutHome.assertVisible()
  447.                    .assertBannerNotVisible();
  448.      }
  449. @@ -83,7 +83,7 @@
  450.          // Add back the banner message to test the dismiss functionality.
  451.          addBannerMessage();
  452.  
  453. -        NavigationHelper.enterAndLoadUrl("about:home");
  454. +        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  455.          mAboutHome.assertVisible();
  456.  
  457.          // Test to make sure the ondismiss handler is called when the close button is clicked.
  458. @@ -95,7 +95,7 @@
  459.      }
  460.  
  461.      private void hideOnToolbarFocusTest() {
  462. -        NavigationHelper.enterAndLoadUrl("about:home");
  463. +        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  464.          mAboutHome.assertVisible()
  465.                    .assertBannerVisible();
  466.  
  467. diff -r b227a707080f mobile/android/base/tests/testImportFromAndroid.java
  468. --- a/mobile/android/base/tests/testImportFromAndroid.java  Wed Apr 30 13:15:46 2014 -0400
  469. +++ b/mobile/android/base/tests/testImportFromAndroid.java  Wed Apr 30 19:51:24 2014 -0700
  470. @@ -130,7 +130,7 @@
  471.      }
  472.  
  473.      private void importDataFromAndroid() {
  474. -        waitForText("Enter Search or Address");
  475. +        waitForText(StringHelper.TITLE_PLACE_HOLDER);
  476.          selectSettingsItem(StringHelper.CUSTOMIZE_SECTION_LABEL, StringHelper.IMPORT_FROM_ANDROID_LABEL);
  477.  
  478.          // Wait for the Import form Android pop-up to be opened. It has the same title as the option so waiting for the "Cancel" button
  479. @@ -152,10 +152,10 @@
  480.              waitForText(StringHelper.IMPORT_FROM_ANDROID_LABEL);
  481.              mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  482.          }
  483. -        waitForText("Privacy"); // Settings is a header for the settings menu page. Waiting for Privacy ensures we are back in the top Settings view
  484. +        waitForText(StringHelper.PRIVARY_SECTION_LABEL); // Settings is a header for the settings menu page. Waiting for Privacy ensures we are back in the top Settings view
  485.          mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Exit Settings
  486.          // Make sure the settings menu has been closed.
  487. -        mAsserter.ok(mSolo.waitForText("Enter Search or Address"), "Waiting for search bar", "Search bar found");
  488. +        mAsserter.ok(mSolo.waitForText(StringHelper.TITLE_PLACE_HOLDER), "Waiting for search bar", "Search bar found");
  489.  
  490.      }
  491.  
  492. diff -r b227a707080f mobile/android/base/tests/testInputUrlBar.java
  493. --- a/mobile/android/base/tests/testInputUrlBar.java    Wed Apr 30 13:15:46 2014 -0400
  494. +++ b/mobile/android/base/tests/testInputUrlBar.java    Wed Apr 30 19:51:24 2014 -0700
  495. @@ -19,7 +19,7 @@
  496.          blockForGeckoReady();
  497.  
  498.          startEditingMode();
  499. -        assertUrlBarText("about:home");
  500. +        assertUrlBarText(StringHelper.ABOUT_HOME_URL);
  501.  
  502.          // Avoid any auto domain completion by using a prefix that matches
  503.          //  nothing, including about: pages
  504. @@ -85,11 +85,11 @@
  505.          // Dismiss editing mode
  506.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  507.  
  508. -        waitForText("Enter Search or Address");
  509. +        waitForText(StringHelper.TITLE_PLACE_HOLDER);
  510.  
  511.          // URL bar should have forgotten about "uv" text.
  512.          startEditingMode();
  513. -        assertUrlBarText("about:home");
  514. +        assertUrlBarText(StringHelper.ABOUT_HOME_URL);
  515.  
  516.          int width = mDriver.getGeckoWidth() / 2;
  517.          int y = mDriver.getGeckoHeight() / 2;
  518. diff -r b227a707080f mobile/android/base/tests/testLinkContextMenu.java
  519. --- a/mobile/android/base/tests/testLinkContextMenu.java    Wed Apr 30 13:15:46 2014 -0400
  520. +++ b/mobile/android/base/tests/testLinkContextMenu.java    Wed Apr 30 19:51:24 2014 -0700
  521. @@ -7,13 +7,13 @@
  522.      private static String LINK_PAGE_URL;
  523.      private static String BLANK_PAGE_URL;
  524.      private static final String LINK_PAGE_TITLE = "Big Link";
  525. -    private static final String linkMenuItems [] = { "Open Link in New Tab", "Open Link in Private Tab", "Copy Link", "Share Link", "Bookmark Link"};
  526. +    private static final String linkMenuItems [] = StringHelper.CONTEXT_MENU_ITEMS_IN_NORMAL_TAB;
  527.  
  528.      public void testLinkContextMenu() {
  529.          blockForGeckoReady();
  530.  
  531. -        LINK_PAGE_URL=getAbsoluteUrl("/robocop/robocop_big_link.html");
  532. -        BLANK_PAGE_URL=getAbsoluteUrl("/robocop/robocop_blank_01.html");
  533. +        LINK_PAGE_URL=getAbsoluteUrl(StringHelper.ROBOCOP_BIG_LINK_URL);
  534. +        BLANK_PAGE_URL=getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  535.          inputAndLoadUrl(LINK_PAGE_URL);
  536.          waitForText(LINK_PAGE_TITLE);
  537.  
  538. diff -r b227a707080f mobile/android/base/tests/testLoad.java
  539. --- a/mobile/android/base/tests/testLoad.java   Wed Apr 30 13:15:46 2014 -0400
  540. +++ b/mobile/android/base/tests/testLoad.java   Wed Apr 30 19:51:24 2014 -0700
  541. @@ -8,7 +8,7 @@
  542.   */
  543.  public class testLoad extends PixelTest {
  544.      public void testLoad() {
  545. -        String url = getAbsoluteUrl("/robocop/robocop_boxes.html");
  546. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BOXES_URL);
  547.  
  548.          blockForGeckoReady();
  549.  
  550. diff -r b227a707080f mobile/android/base/tests/testMailToContextMenu.java
  551. --- a/mobile/android/base/tests/testMailToContextMenu.java  Wed Apr 30 13:15:46 2014 -0400
  552. +++ b/mobile/android/base/tests/testMailToContextMenu.java  Wed Apr 30 19:51:24 2014 -0700
  553. @@ -5,13 +5,13 @@
  554.  
  555.      // Test website strings
  556.      private static String MAILTO_PAGE_URL;
  557. -    private static final String MAILTO_PAGE_TITLE = "Big Mailto";
  558. +    private static final String MAILTO_PAGE_TITLE = StringHelper.ROBOCOP_BIG_MAILTO_TITLE;
  559.      private static final String mailtoMenuItems [] = {"Copy Email Address", "Share Email Address"};
  560.  
  561.      public void testMailToContextMenu() {
  562.          blockForGeckoReady();
  563.  
  564. -        MAILTO_PAGE_URL=getAbsoluteUrl("/robocop/robocop_big_mailto.html");
  565. +        MAILTO_PAGE_URL=getAbsoluteUrl(StringHelper.ROBOCOP_BIG_MAILTO_URL);
  566.          inputAndLoadUrl(MAILTO_PAGE_URL);
  567.          waitForText(MAILTO_PAGE_TITLE);
  568.  
  569. diff -r b227a707080f mobile/android/base/tests/testMasterPassword.java
  570. --- a/mobile/android/base/tests/testMasterPassword.java Wed Apr 30 13:15:46 2014 -0400
  571. +++ b/mobile/android/base/tests/testMasterPassword.java Wed Apr 30 19:51:24 2014 -0700
  572. @@ -22,7 +22,7 @@
  573.      public void enableMasterPassword(String password, String badPassword) {
  574.  
  575.          // Look for the 'Settings' menu if this device/OS uses it
  576. -        selectSettingsItem("Privacy", "Use master password");
  577. +        selectSettingsItem(StringHelper.PRIVACY_SECTION_LABEL, "Use master password");
  578.          waitForText("^Create Master Password$");
  579.  
  580.          // Verify that the OK button is not activated until both fields are filled
  581. @@ -75,14 +75,14 @@
  582.              waitForText("Use master password");
  583.              mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  584.          }
  585. -        waitForText("Settings");
  586. +        waitForText(StringHelper.SETTINGS_LABEL);
  587.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu
  588.      }
  589.  
  590.      public void disableMasterPassword(String password, String badPassword) {
  591.  
  592.          // Look for the 'Settings' menu if this device/OS uses it
  593. -        selectSettingsItem("Privacy", "Use master password");
  594. +        selectSettingsItem(StringHelper.PRIVACY_SECTION_LABEL, "Use master password");
  595.          waitForText("^Remove Master Password$");
  596.  
  597.          // Verify that the OK button is not activated if the password field is empty
  598. @@ -139,7 +139,7 @@
  599.      public void clearPrivateData() {
  600.  
  601.          // Look for the 'Settings' menu if this device/OS uses it
  602. -        selectSettingsItem("Privacy", "Clear private data");
  603. +        selectSettingsItem(StringHelper.PRIVACY_SECTION_LABEL, "Clear private data");
  604.  
  605.          waitForText("Browsing history"); // Make sure the Clear private data pop-up is displayed
  606.          Actions.EventExpecter clearPrivateDataEventExpecter = mActions.expectGeckoEvent("Sanitize:Finished");
  607. @@ -168,7 +168,7 @@
  608.              waitForText("Use master password");
  609.              mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  610.          }
  611. -        waitForText("Settings");
  612. +        waitForText(StringHelper.SETTINGS_LABEL);
  613.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu
  614.          // Make sure the settings menu has been closed.
  615.          mAsserter.ok(mSolo.waitForText("Browser Blank Page 01"), "Waiting for blank browser page after exiting settings", "Blank browser page present");
  616. diff -r b227a707080f mobile/android/base/tests/testNewTab.java
  617. --- a/mobile/android/base/tests/testNewTab.java Wed Apr 30 13:15:46 2014 -0400
  618. +++ b/mobile/android/base/tests/testNewTab.java Wed Apr 30 19:51:24 2014 -0700
  619. @@ -15,8 +15,8 @@
  620.      private int tabCountInt = 0;
  621.  
  622.      public void testNewTab() {
  623. -        String url = getAbsoluteUrl("/robocop/robocop_blank_01.html");
  624. -        String url2 = getAbsoluteUrl("/robocop/robocop_blank_02.html");
  625. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL);
  626. +        String url2 = getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_02_URL);
  627.  
  628.          blockForGeckoReady();
  629.  
  630. diff -r b227a707080f mobile/android/base/tests/testOverscroll.java
  631. --- a/mobile/android/base/tests/testOverscroll.java Wed Apr 30 13:15:46 2014 -0400
  632. +++ b/mobile/android/base/tests/testOverscroll.java Wed Apr 30 19:51:24 2014 -0700
  633. @@ -11,7 +11,7 @@
  634.   */
  635.  public class testOverscroll extends PixelTest {
  636.      public void testOverscroll() {
  637. -        String url = getAbsoluteUrl("/robocop/robocop_boxes.html");
  638. +        String url = getAbsoluteUrl(StringBuilder.ROBOCOP_BOXES_URL);
  639.  
  640.          MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
  641.  
  642. diff -r b227a707080f mobile/android/base/tests/testPanCorrectness.java
  643. --- a/mobile/android/base/tests/testPanCorrectness.java Wed Apr 30 13:15:46 2014 -0400
  644. +++ b/mobile/android/base/tests/testPanCorrectness.java Wed Apr 30 19:51:24 2014 -0700
  645. @@ -11,7 +11,7 @@
  646.   */
  647.  public class testPanCorrectness extends PixelTest {
  648.      public void testPanCorrectness() {
  649. -        String url = getAbsoluteUrl("/robocop/robocop_boxes.html");
  650. +        String url = getAbsoluteUrl(StringHelper.ROBOCOP_BOXES_URL);
  651.  
  652.          MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
  653.  
  654. diff -r b227a707080f mobile/android/base/tests/testPermissions.java
  655. --- a/mobile/android/base/tests/testPermissions.java    Wed Apr 30 13:15:46 2014 -0400
  656. +++ b/mobile/android/base/tests/testPermissions.java    Wed Apr 30 19:51:24 2014 -0700
  657. @@ -18,7 +18,7 @@
  658.          Actions.RepeatedEventExpecter paintExpecter;
  659.  
  660.          // Test geolocation notification
  661. -        loadAndPaint(getAbsoluteUrl("/robocop/robocop_geolocation.html"));
  662. +        loadAndPaint(getAbsoluteUrl(StringHelper.ROBOCOP_GEOLOCATION_URL));
  663.          waitForText("wants your location");
  664.  
  665.          // Uncheck the "Don't ask again for this site" checkbox
  666. diff -r b227a707080f mobile/android/base/tests/testPictureLinkContextMenu.java
  667. --- a/mobile/android/base/tests/testPictureLinkContextMenu.java Wed Apr 30 13:15:46 2014 -0400
  668. +++ b/mobile/android/base/tests/testPictureLinkContextMenu.java Wed Apr 30 19:51:24 2014 -0700
  669. @@ -6,17 +6,17 @@
  670.      // Test website strings
  671.      private static String PICTURE_PAGE_URL;
  672.      private static String BLANK_PAGE_URL;
  673. -    private static final String PICTURE_PAGE_TITLE = "Picture Link";
  674. +    private static final String PICTURE_PAGE_TITLE = StringHelper.ROBOCOP_PICTURE_LINK_TITLE;
  675.      private static final String tabs [] = { "Image", "Link" };
  676.      private static final String photoMenuItems [] = { "Copy Image Location", "Share Image", "Set Image As", "Save Image" };
  677. -    private static final String linkMenuItems [] = { "Open Link in New Tab", "Open Link in Private Tab", "Copy Link", "Share Link", "Bookmark Link"};
  678. +    private static final String linkMenuItems [] = StringHelper.CONTEXT_MENU_ITEMS_IN_NORMAL_TAB;
  679.      private static final String imageTitle = "^Image$";
  680.  
  681.      public void testPictureLinkContextMenu() {
  682.          blockForGeckoReady();
  683.  
  684. -        PICTURE_PAGE_URL=getAbsoluteUrl("/robocop/robocop_picture_link.html");
  685. -        BLANK_PAGE_URL=getAbsoluteUrl("/robocop/robocop_blank_02.html");
  686. +        PICTURE_PAGE_URL=getAbsoluteUrl(StringHelper.ROBOCOP_PICTURE_LINK_URL);
  687. +        BLANK_PAGE_URL=getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_02_URL);
  688.          loadAndPaint(PICTURE_PAGE_URL);
  689.          verifyPageTitle(PICTURE_PAGE_TITLE);
  690.  
  691. diff -r b227a707080f mobile/android/base/tests/testPromptGridInput.java
  692. --- a/mobile/android/base/tests/testPromptGridInput.java    Wed Apr 30 13:15:46 2014 -0400
  693. +++ b/mobile/android/base/tests/testPromptGridInput.java    Wed Apr 30 19:51:24 2014 -0700
  694. @@ -36,8 +36,8 @@
  695.  
  696.      public void test(final int num) {
  697.          // Load about:blank between each test to ensure we reset state
  698. -        loadUrl("about:blank");
  699. -        mAsserter.ok(waitForText("about:blank"), "Loaded blank page", "page title match");
  700. +        loadUrl(StringHelper.ABOUT_BLANK_URL);
  701. +        mAsserter.ok(waitForText(StringHelper.ABOUT_BLANK_URL), "Loaded blank page", "page title match");
  702.  
  703.          loadUrl("chrome://roboextender/content/robocop_prompt_gridinput.html#test" + num);
  704.      }
  705. diff -r b227a707080f mobile/android/base/tests/testReaderMode.java
  706. --- a/mobile/android/base/tests/testReaderMode.java Wed Apr 30 13:15:46 2014 -0400
  707. +++ b/mobile/android/base/tests/testReaderMode.java Wed Apr 30 19:51:24 2014 -0700
  708. @@ -72,7 +72,7 @@
  709.          contentPageShowExpecter.unregisterListener();
  710.          paintExpecter.blockUntilClear(EVENT_CLEAR_DELAY_MS);
  711.          paintExpecter.unregisterListener();
  712. -        verifyPageTitle("Robocop Text Page");
  713. +        verifyPageTitle(StringHelper.ROBOCOP_TEXT_PAGE_TITLE);
  714.  
  715.          // Open the share menu for the reader toolbar
  716.          height = mDriver.getGeckoTop() + mDriver.getGeckoHeight() - 10;
  717. @@ -103,7 +103,7 @@
  718.          contentEventExpecter.unregisterListener();
  719.  
  720.          // Check if the page is present in the Reading List
  721. -        mAsserter.ok(mSolo.waitForText("Robocop Text Page"), "Verify if the page is added to your Reading List", "The page is present in your Reading List");
  722. +        mAsserter.ok(mSolo.waitForText(StringHelper.ROBOCOP_TEXT_PAGE_TITLE), "Verify if the page is added to your Reading List", "The page is present in your Reading List");
  723.  
  724.          // Check if the page is added in History tab like a Reading List item
  725.          openAboutHomeTab(AboutHomeTabs.MOST_RECENT);
  726. @@ -113,7 +113,7 @@
  727.          mSolo.clickLongOnView(child);
  728.          mAsserter.ok(mSolo.waitForText("Open in Reader"), "Verify if the page is present in history as a Reading List item", "The page is present in history as a Reading List item");
  729.          mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Dismiss the context menu
  730. -        mSolo.waitForText("Robocop Text Page");
  731. +        mSolo.waitForText(StringHelper.ROBOCOP_TEXT_PAGE_TITLE);
  732.  
  733.          // Verify separately the Reading List entries for tablets and phone because for tablets there is an extra child in UI design
  734.          if (devType.equals("phone")) {
  735. @@ -131,7 +131,7 @@
  736.          mSolo.clickOnView(child);
  737.          contentEventExpecter.blockForEvent();
  738.          contentEventExpecter.unregisterListener();
  739. -        verifyPageTitle("Robocop Text Page");
  740. +        verifyPageTitle(StringHelper.ROBOCOP_TEXT_PAGE_TITLE);
  741.  
  742.          // Verify that we are in reader mode and remove the page from Reading List
  743.          height = mDriver.getGeckoTop() + mDriver.getGeckoHeight() - 10;
  744. @@ -139,7 +139,7 @@
  745.          mAsserter.dumpLog("Long Clicking at width = " + String.valueOf(width) + " and height = " + String.valueOf(height));
  746.          mSolo.clickOnScreen(width,height);
  747.          mAsserter.ok(mSolo.waitForText("Page removed from your Reading List"), "Waiting for the page to removed from your Reading List", "The page is removed from your Reading List");
  748. -        verifyPageTitle("Robocop Text Page");
  749. +        verifyPageTitle(StringHelper.ROBOCOP_TEXT_PAGE_TITLE);
  750.  
  751.          //Check if the Reading List is empty
  752.          openAboutHomeTab(AboutHomeTabs.READING_LIST);
  753. diff -r b227a707080f mobile/android/base/tests/testSessionOOMRestore.java
  754. --- a/mobile/android/base/tests/testSessionOOMRestore.java  Wed Apr 30 13:15:46 2014 -0400
  755. +++ b/mobile/android/base/tests/testSessionOOMRestore.java  Wed Apr 30 19:51:24 2014 -0700
  756. @@ -17,7 +17,7 @@
  757.  
  758.      @Override
  759.      public void setActivityIntent(Intent intent) {
  760. -        PageInfo home = new PageInfo("about:home");
  761. +        PageInfo home = new PageInfo(StringHelper.ABOUT_HOME_URL);
  762.          PageInfo page1 = new PageInfo("page1");
  763.          PageInfo page2 = new PageInfo("page2");
  764.          PageInfo page3 = new PageInfo("page3");
  765. diff -r b227a707080f mobile/android/base/tests/testSessionOOMSave.java
  766. --- a/mobile/android/base/tests/testSessionOOMSave.java Wed Apr 30 13:15:46 2014 -0400
  767. +++ b/mobile/android/base/tests/testSessionOOMSave.java Wed Apr 30 19:51:24 2014 -0700
  768. @@ -17,7 +17,7 @@
  769.          pageShowExpecter.blockForEvent();
  770.          pageShowExpecter.unregisterListener();
  771.  
  772. -        PageInfo home = new PageInfo("about:home");
  773. +        PageInfo home = new PageInfo(StringHelper.ABOUT_HOME_URL);
  774.          PageInfo page1 = new PageInfo("page1");
  775.          PageInfo page2 = new PageInfo("page2");
  776.          PageInfo page3 = new PageInfo("page3");
  777. diff -r b227a707080f mobile/android/base/tests/testSettingsMenuItems.java
  778. --- a/mobile/android/base/tests/testSettingsMenuItems.java  Wed Apr 30 13:15:46 2014 -0400
  779. +++ b/mobile/android/base/tests/testSettingsMenuItems.java  Wed Apr 30 19:51:24 2014 -0700
  780. @@ -14,8 +14,6 @@
  781.   *  default values for them
  782.   */
  783.  public class testSettingsMenuItems extends PixelTest {
  784. -    String BRAND_NAME = "(Fennec|Nightly|Aurora|Firefox|Firefox Beta)";
  785. -
  786.      /**
  787.       * The following String[][] (arrays) match the menu hierarchy for each section.
  788.       * Each String[] (array) represents the menu items/choices in the following order:
  789. @@ -29,51 +27,51 @@
  790.       */
  791.  
  792.      // Customize menu items.
  793. -    String[] PATH_CUSTOMIZE = { "Customize" };
  794. +    String[] PATH_CUSTOMIZE = { StringHelper.CUSTOMIZE_SECTION_LABEL };
  795.      String[][] OPTIONS_CUSTOMIZE = {
  796.          { "Home" },
  797.          { "Search", "", "Show search suggestions", "Installed search engines"},
  798. -        { "Tabs", "Don't restore after quitting " + BRAND_NAME, "Always restore", "Don't restore after quitting " + BRAND_NAME },
  799. -        { "Import from Android", "", "Bookmarks", "History", "Import" },
  800. +        { StringHelper.TABS_LABEL, "Don't restore after quitting " + StringHelper.BRAND_NAME, "Always restore", "Don't restore after quitting " + StringHelper.BRAND_NAME },
  801. +        { StringHelper.IMPORT_FROM_ANDROID_LABEL, "", "Bookmarks", "History", "Import" },
  802.      };
  803.  
  804.      // Home panel menu items.
  805. -    String[] PATH_HOME = { "Customize", "Home" };
  806. +    String[] PATH_HOME = { StringHelper.CUSTOMIZE_SECTION_LABEL, "Home" };
  807.      String[][] OPTIONS_HOME = {
  808.        { "Panels" },
  809.        { "Automatic updates", "Enabled", "Enabled", "Only over Wi-Fi" },
  810.      };
  811.  
  812.      // Display menu items.
  813. -    String[] PATH_DISPLAY = { "Display" };
  814. +    String[] PATH_DISPLAY = { StringHelper.DISPLAY_SECTION_LABEL };
  815.      String[][] OPTIONS_DISPLAY = {
  816. -        { "Text size" },
  817. -        { "Title bar", "Show page title", "Show page title", "Show page address" },
  818. +        { StringHelper.TEXT_SIZE_LABEL },
  819. +        { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_TITLE_LABEL, StringHelper.SHOW_PAGE_TITLE_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL },
  820.          { "Advanced" },
  821. -        { "Character encoding", "Don't show menu", "Show menu", "Don't show menu" },
  822. -        { "Plugins", "Tap to play", "Enabled", "Tap to play", "Disabled" },
  823. +        { StringHelper.CHARACTER_ENCODING_LABEL, "Don't show menu", "Show menu", "Don't show menu" },
  824. +        { StringHelper.PLUGINS_LABEL, "Tap to play", "Enabled", "Tap to play", "Disabled" },
  825.      };
  826.  
  827.      // Privacy menu items.
  828.      String[] PATH_PRIVACY = { "Privacy" };
  829.      String[][] OPTIONS_PRIVACY = {
  830. -        { "Tracking", "Do not tell sites anything about my tracking preferences", "Tell sites that I do not want to be tracked", "Tell sites that I want to be tracked", "Do not tell sites anything about my tracking preferences" },
  831. -        { "Cookies", "Enabled", "Enabled, excluding 3rd party", "Disabled" },
  832. -        { "Remember passwords" },
  833. -        { "Use master password" },
  834. -        { "Clear private data", "", "Browsing history", "Downloads", "Form & search history", "Cookies & active logins", "Saved passwords", "Cache", "Offline website data", "Site settings", "Clear data" },
  835. +        { StringHelper.TRACKING_LABEL, "Do not tell sites anything about my tracking preferences", "Tell sites that I do not want to be tracked", "Tell sites that I want to be tracked", "Do not tell sites anything about my tracking preferences" },
  836. +        { StringHelper.COOKIES_LABEL, "Enabled", "Enabled, excluding 3rd party", "Disabled" },
  837. +        { StringHelper.REMEMBER_PASSWORDS_LABEL },
  838. +        { StringHelper.MASTER_PASSWORD_LABEL },
  839. +        { StringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Downloads", "Form & search history", "Cookies & active logins", "Saved passwords", "Cache", "Offline website data", "Site settings", "Clear data" },
  840.      };
  841.  
  842.      // Mozilla/vendor menu items.
  843.      String[] PATH_MOZILLA = { "Mozilla" };
  844.      String[][] OPTIONS_MOZILLA = {
  845. -        { "About " + BRAND_NAME },
  846. -        { "FAQs" },
  847. -        { "Give feedback" },
  848. -        { "Show product announcements" },
  849. +        { StringHelper.ABOUT_LABEL },
  850. +        { StringHelper.FAQS_LABEL },
  851. +        { StringHelper.FEEDBACK_LABEL },
  852. +        { StringHelper.PRODUCT_ANNOUNCEMENTS_LABEL },
  853.          { "Data choices" },
  854. -        { BRAND_NAME + " Health Report", "Shares data with Mozilla about your browser health and helps you understand your browser performance" },
  855. -        { "View my Health Report" },
  856. +        { StringHelper.HEALTH_REPORT_LABEL, "Shares data with Mozilla about your browser health and helps you understand your browser performance" },
  857. +        { StringHelper.MY_HEALTH_REPORT_LABEL },
  858.      };
  859.  
  860.      /*
  861. @@ -105,18 +103,18 @@
  862.          // Set special handling for Settings items that are conditionally built.
  863.          addConditionalSettings(settingsMenuItems);
  864.  
  865. -        selectMenuItem("Settings");
  866. -        waitForText("Settings");
  867. +        selectMenuItem(StringHelper.SETTINGS_LABEL);
  868. +        waitForText(StringHelper.SETTINGS_LABEL);
  869.  
  870.          // Dismiss the Settings screen and verify that the view is returned to about:home page
  871.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  872.  
  873.          // Waiting for page title to appear to be sure that is fully loaded before opening the menu
  874.          waitForText("Enter Search");
  875. -        verifyUrl("about:home");
  876. +        verifyUrl(StringHelper.ABOUT_HOME_URL);
  877.  
  878. -        selectMenuItem("Settings");
  879. -        waitForText("Settings");
  880. +        selectMenuItem(StringHelper.SETTINGS_LABEL);
  881. +        waitForText(StringHelper.SETTINGS_LABEL);
  882.  
  883.          checkForSync(mDevice);
  884.  
  885. @@ -136,7 +134,7 @@
  886.              waitForEnabledText(customizeString);
  887.              mSolo.clickOnText(customizeString);
  888.          }
  889. -        mAsserter.ok(mSolo.waitForText("Sync"), "Waiting for Sync option", "The Sync option is present");
  890. +        mAsserter.ok(mSolo.waitForText(StringHelper.SYNC_LABEL), "Waiting for Sync option", "The Sync option is present");
  891.      }
  892.  
  893.      /**
  894. @@ -166,13 +164,13 @@
  895.  
  896.          // Crash reporter
  897.          if (AppConstants.MOZ_CRASHREPORTER) {
  898. -            String[] crashReporterUi = { "Crash Reporter", BRAND_NAME + " submits crash reports to help Mozilla make your browser more stable and secure" };
  899. +            String[] crashReporterUi = { "Crash Reporter", StringHelper.BRAND_NAME + " submits crash reports to help Mozilla make your browser more stable and secure" };
  900.              settingsMap.get(PATH_MOZILLA).add(crashReporterUi);
  901.          }
  902.  
  903.          // Telemetry
  904.          if (AppConstants.MOZ_TELEMETRY_REPORTING) {
  905. -            String[] telemetryUi = { "Telemetry", "Shares performance, usage, hardware and customization data about your browser with Mozilla to help us make " + BRAND_NAME + " better" };
  906. +            String[] telemetryUi = { "Telemetry", "Shares performance, usage, hardware and customization data about your browser with Mozilla to help us make " + StringHelper.BRAND_NAME + " better" };
  907.              settingsMap.get(PATH_MOZILLA).add(telemetryUi);
  908.          }
  909.      }
  910. diff -r b227a707080f mobile/android/base/tests/testShareLink.java
  911. --- a/mobile/android/base/tests/testShareLink.java  Wed Apr 30 13:15:46 2014 -0400
  912. +++ b/mobile/android/base/tests/testShareLink.java  Wed Apr 30 19:51:24 2014 -0700
  913. @@ -25,10 +25,10 @@
  914.   */
  915.  public class testShareLink extends AboutHomeTest {
  916.      String url;
  917. -    String urlTitle = "Big Link";
  918. +    String urlTitle = StringHelper.ROBOCOP_BIG_LINK_TITLE;
  919.  
  920.      public void testShareLink() {
  921. -        url = getAbsoluteUrl("/robocop/robocop_big_link.html");
  922. +        url = getAbsoluteUrl(StringHelper.ROBOCOP_BIG_LINK_URL);
  923.          ArrayList<String> shareOptions;
  924.          blockForGeckoReady();
  925.  
  926. @@ -38,7 +38,7 @@
  927.          inputAndLoadUrl(url);
  928.          verifyPageTitle(urlTitle); // Waiting for page title to ensure the page is loaded
  929.  
  930. -        selectMenuItem("Share");
  931. +        selectMenuItem(StringHelper.SHARE_LABEL);
  932.          if (Build.VERSION.SDK_INT >= 14) {
  933.              // Check for our own sync in the submenu.
  934.              waitForText("Sync$");
  935. @@ -93,16 +93,16 @@
  936.  
  937.          // Prepopulate top sites with history items to overflow tiles.
  938.          // We are trying to move away from using reflection and doing more black-box testing.
  939. -        inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_blank_01.html"));
  940. -        inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_blank_02.html"));
  941. -        inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_blank_03.html"));
  942. -        inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_blank_04.html"));
  943. +        inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_01_URL));
  944. +        inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_02_URL));
  945. +        inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_03_URL));
  946. +        inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_04_URL));
  947.          if (mDevice.type.equals("tablet")) {
  948.              // Tablets have more tile spaces to fill.
  949. -            inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_blank_05.html"));
  950. -            inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_boxes.html"));
  951. -            inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_search.html"));
  952. -            inputAndLoadUrl(getAbsoluteUrl("/robocop/robocop_text_page.html"));
  953. +            inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BLANK_PAGE_05_URL));
  954. +            inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_BOXES_URL));
  955. +            inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_SEARCH_URL));
  956. +            inputAndLoadUrl(getAbsoluteUrl(StringHelper.ROBOCOP_TEXT_PAGE_URL));
  957.          }
  958.  
  959.          // Test the share popup in Top Sites.
  960. diff -r b227a707080f mobile/android/base/tests/testSystemPages.java
  961. --- a/mobile/android/base/tests/testSystemPages.java    Wed Apr 30 13:15:46 2014 -0400
  962. +++ b/mobile/android/base/tests/testSystemPages.java    Wed Apr 30 19:51:24 2014 -0700
  963. @@ -12,21 +12,21 @@
  964.      public void testSystemPages() {
  965.          blockForGeckoReady();
  966.  
  967. -        String urls [] = { "about:firefox", "about:rights", "about:addons", "about:downloads", "about:buildconfig", "about:feedback", "about:healthreport", "about:" };
  968. +        String urls [] = { StringHelper.ABOUT_FIREFOX_URL, StringHelper.ABOUT_RIGHTS_URL, StringHelper.ABOUT_ADDONS_URL, StringHelper.ABOUT_DOWNLOADS_URL, StringHelper.ABOUT_BUILDCONFIG_URL, StringHelper.ABOUT_FEEDBACK_URL, StringHelper.ABOUT_HEALTHREPORT_URL, StringHelper.ABOUT_URL };
  969.          // Pages to be tested from the menu and their expected urls. This if of the form { {{ <path to item> }, { <expected url> }}* }
  970. -        String menuItems [][][] = {{{ "Apps" }, { "about:apps" }},
  971. -                                  {{ "Downloads" }, { "about:downloads" }},
  972. -                                  {{ "Add-ons" }, { "about:addons" }},
  973. -                                  {{ "Settings", "Mozilla", "About (Fennec|Nightly|Aurora|Firefox|Firefox Beta)" }, { "about:" }},
  974. -                                  {{ "Settings", "Mozilla", "Give feedback" }, { "about:feedback" }},
  975. -                                  {{ "Settings", "Mozilla", "View my Health Report" }, { "about:healthreport" }}};
  976. +        String menuItems [][][] = {{{ StringHelper.APPS_LABEL }, { StringHelper.ABOUT_APPS_URL }},
  977. +                                  {{ StringHelper.DOWNLOADS_LABEL }, { StringHelper.ABOUT_DOWNLOADS_URL}},
  978. +                                  {{ StringHelper.ADDONS_LABEL }, { StringHelper.ABOUT_ADDONS_URL }},
  979. +                                  {{ StringHelper.SETTINGS_LABEL, StringHelper.MOZILLA_SECTION_LABEL, StringHelper.ABOUT_LABEL }, { StringHelper.ABOUT_URL }},
  980. +                                  {{ StringHelper.SETTINGS_LABEL, StringHelper.MOZILLA_SECTION_LABEL, StringHelper.FEEDBACK_LABEL }, { StringHelper.ABOUT_FEEDBACK_URL }},
  981. +                                  {{ StringHelper.SETTINGS_LABEL, StringHelper.MOZILLA_SECTION_LABEL, StringHelper.MY_HEALTH_REPORT_LABEL }, { StringHelper.ABOUT_HEALTHREPORT_URL }}};
  982.  
  983.          /* Load system pages from url and check that the pages are loaded in the same tab */
  984.          checkUrl(urls);
  985.  
  986.          /* Verify that the search field is not in the focus by pressing back. That will load the previous
  987.             about: page if there is no the keyboard to dismiss, meaning that the search field was not in focus */
  988. -        loadAndPaint("about:about");
  989. +        loadAndPaint(StringHelper.ABOUT_ABOUT_URL);
  990.  
  991.          // Press back to verify if the keyboard is dismissed or the previous about: page loads
  992.          mActions.sendSpecialKey(Actions.SpecialKey.BACK);
  993. @@ -34,8 +34,8 @@
  994.          mSolo.sleep(AFTER_BACK_SLEEP_MS);
  995.  
  996.          // We will use the "about:" page as our reference page.
  997. -        loadAndPaint("about:");
  998. -        verifyUrl("about:"); // Verify that the previous about: page is loaded, meaning no keyboard was present
  999. +        loadAndPaint(StringHelper.ABOUT_URL);
  1000. +        verifyUrl(StringHelper.ABOUT_URL); // Verify that the previous about: page is loaded, meaning no keyboard was present
  1001.  
  1002.          // Load system pages by navigating through the UI.
  1003.          loadItemsByLevel(menuItems);
  1004. @@ -68,7 +68,7 @@
  1005.              selectMenuItemByPath(pathToItem);
  1006.  
  1007.              // Wait for the new tab and page to load
  1008. -            if ("about:".equals(expectedUrl)) {
  1009. +            if (StringHelper.ABOUT_URL.equals(expectedUrl)) {
  1010.                  waitForPaint(paintExpecter); // Waiting for the page to load
  1011.                  paintExpecter.unregisterListener();
  1012.              } else {
  1013. @@ -79,7 +79,7 @@
  1014.              contentEventExpecter.unregisterListener();
  1015.  
  1016.              verifyUrl(expectedUrl);
  1017. -            if ("about:".equals(expectedUrl)) {
  1018. +            if (StringHelper.ABOUT_URL.equals(expectedUrl)) {
  1019.                  // Decreasing because we do not expect this to be in a different tab.
  1020.                  expectedTabCount--;
  1021.              }
  1022. diff -r b227a707080f mobile/android/base/tests/testThumbnails.java
  1023. --- a/mobile/android/base/tests/testThumbnails.java Wed Apr 30 13:15:46 2014 -0400
  1024. +++ b/mobile/android/base/tests/testThumbnails.java Wed Apr 30 19:51:24 2014 -0700
  1025. @@ -32,7 +32,7 @@
  1026.          mSolo.sleep(thumbnailDelay);
  1027.          inputAndLoadUrl(site2Url);
  1028.          mSolo.sleep(thumbnailDelay);
  1029. -        inputAndLoadUrl("about:home");
  1030. +        inputAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  1031.          waitForTest(new ThumbnailTest(site1Title, Color.GREEN), 5000);
  1032.          mAsserter.is(getTopSiteThumbnailColor(site1Title), Color.GREEN, "Top site thumbnail updated for HTTP 200");
  1033.          waitForTest(new ThumbnailTest(site2Title, Color.GREEN), 5000);
  1034. @@ -43,7 +43,7 @@
  1035.          mSolo.sleep(thumbnailDelay);
  1036.          inputAndLoadUrl(site2Url);
  1037.          mSolo.sleep(thumbnailDelay);
  1038. -        inputAndLoadUrl("about:home");
  1039. +        inputAndLoadUrl(StringHelper.ABOUT_HOME_URL);
  1040.          waitForTest(new ThumbnailTest(site1Title, Color.RED), 5000);
  1041.          mAsserter.is(getTopSiteThumbnailColor(site1Title), Color.RED, "Top site thumbnail updated for HTTP 200");
  1042.          waitForTest(new ThumbnailTest(site2Title, Color.GREEN), 5000);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!