diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseRobocopTest.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseRobocopTest.java index 0fa70c8d1a9a3..18e40375530e5 100644 --- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseRobocopTest.java +++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseRobocopTest.java @@ -174,8 +174,7 @@ protected void setUp() throws Exception { // Set up Robotium.solo and Driver objects Activity tempActivity = getActivity(); - StringHelper.initialize(tempActivity.getResources()); - mStringHelper = StringHelper.get(); + mStringHelper = StringHelper.initialize(tempActivity.getResources()); mSolo = new Solo(getInstrumentation(), tempActivity); mDriver = new FennecNativeDriver(tempActivity, mSolo, mRootPath); diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java index 4c2f536218591..506670342f0b0 100644 --- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java +++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java @@ -374,17 +374,12 @@ private StringHelper(final Resources res) { DONT_RESTORE_QUIT = res.getString(R.string.pref_restore_quit); } - public static void initialize(Resources res) { + public static StringHelper initialize(Resources res) { if (instance != null) { throw new IllegalStateException(StringHelper.class.getSimpleName() + " already Initialized"); } - instance = new StringHelper(res); - } - public static StringHelper get() { - if (instance == null) { - throw new IllegalStateException(StringHelper.class.getSimpleName() + " instance is not yet initialized. Use StringHelper.initialize(Resources) first."); - } + instance = new StringHelper(res); return instance; } diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/helpers/GeckoClickHelper.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/helpers/GeckoClickHelper.java index 919bebaa8f453..55110dfcb4299 100644 --- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/helpers/GeckoClickHelper.java +++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/helpers/GeckoClickHelper.java @@ -31,11 +31,11 @@ private GeckoClickHelper() { /* To disallow instantiation. */ } * The link should be positioned at the top of the page, at least 60px high and * aligned to the middle. */ - public static void openCentralizedLinkInNewTab() { + public static void openCentralizedLinkInNewTab(StringHelper stringHelper) { openLinkContextMenu(); // Click on "Open Link in New Tab" - sSolo.clickOnText(StringHelper.get().CONTEXT_MENU_ITEMS_IN_NORMAL_TAB[0]); + sSolo.clickOnText(stringHelper.CONTEXT_MENU_ITEMS_IN_NORMAL_TAB[0]); } private static void openLinkContextMenu() { diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testStateWhileLoading.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testStateWhileLoading.java index 7f7b47450b5c3..bb4820c0b61dd 100644 --- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testStateWhileLoading.java +++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testStateWhileLoading.java @@ -21,7 +21,7 @@ public void testStateWhileLoading() { NavigationHelper.enterAndLoadUrl(mStringHelper.ROBOCOP_LINK_TO_SLOW_LOADING); - GeckoClickHelper.openCentralizedLinkInNewTab(); + GeckoClickHelper.openCentralizedLinkInNewTab(mStringHelper); WaitHelper.waitForPageLoad(new Runnable() { @Override