Backed out changeset 7c44c0343564 (bug 1181020) for causing intermittent testAboutPage failures.

2024-09-13 09:24:08 -07:00 · 2015-07-16 15:11:20 -04:00 · 2015-07-16 15:11:20 -04:00 · e18ef27f55
commit e18ef27f55
parent afe3862cf0
41 changed files with 60 additions and 48 deletions
--- a/build/mobile/robocop/FennecNativeActions.java
+++ b/build/mobile/robocop/FennecNativeActions.java
@ -23,7 +23,7 @@ import android.os.SystemClock;
 import android.text.TextUtils;
 import android.view.KeyEvent;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 public class FennecNativeActions implements Actions {
    private static final String LOGTAG = "FennecNativeActions";
@ -367,7 +367,7 @@ public class FennecNativeActions implements Actions {
        if (keyCode <= 0 || keyCode > KeyEvent.getMaxKeyCode()) {
            mAsserter.ok(false, "sendKeyCode", "Unknown keyCode " + keyCode);
        }
-        mSolo.sendKey(keyCode);
+        mInstr.sendCharacterSync(keyCode);
    }

    @Override
--- a/build/mobile/robocop/FennecNativeDriver.java
+++ b/build/mobile/robocop/FennecNativeDriver.java
@ -28,7 +28,7 @@ import android.app.Activity;
 import android.util.Log;
 import android.view.View;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 public class FennecNativeDriver implements Driver {
    private static final int FRAME_TIME_THRESHOLD = 25;     // allow 25ms per frame (40fps)
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@ -8,7 +8,7 @@ TESTPATH     := $(topsrcdir)/$(mobile-tests)
 ANDROID_APK_NAME := robocop-debug

 ANDROID_EXTRA_JARS += \
-  $(srcdir)/robotium-solo-5.4.1.jar \
+  $(srcdir)/robotium-solo-4.3.1.jar \
  $(NULL)

 ANDROID_ASSETS_DIR := $(TESTPATH)/assets
--- a/build/mobile/robocop/robotium-solo-4.3.1.jar
+++ b/build/mobile/robocop/robotium-solo-4.3.1.jar
--- a/build/mobile/robocop/robotium-solo-5.4.1.jar
+++ b/build/mobile/robocop/robotium-solo-5.4.1.jar
--- a/mobile/android/gradle/app/build.gradle
+++ b/mobile/android/gradle/app/build.gradle
@ -47,7 +47,7 @@ dependencies {
    compile project(':base')
    compile project(':omnijar')
    // Including the Robotium JAR directly can cause issues with dexing.
-    androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.4.1'
+    androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
 }

 /**
--- a/mobile/android/tests/browser/robocop/AboutHomeTest.java
+++ b/mobile/android/tests/browser/robocop/AboutHomeTest.java
@ -18,8 +18,7 @@ import android.widget.ListView;
 import android.widget.TabWidget;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
-
+import com.jayway.android.robotium.solo.Condition;

 /**
 * This class is an extension of BaseTest that helps with interaction with about:home
--- a/mobile/android/tests/browser/robocop/BaseRobocopTest.java
+++ b/mobile/android/tests/browser/robocop/BaseRobocopTest.java
@ -12,7 +12,7 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 import android.util.Log;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
--- a/mobile/android/tests/browser/robocop/BaseTest.java
+++ b/mobile/android/tests/browser/robocop/BaseTest.java
@ -19,6 +19,7 @@ import org.json.JSONObject;
 import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.Element;
 import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.GeckoThread.LaunchState;
@ -29,8 +30,10 @@ import org.mozilla.gecko.Tabs;

 import android.app.Activity;
 import android.content.ContentValues;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.AssetManager;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.os.Build;
 import android.os.SystemClock;
@ -47,9 +50,9 @@ import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
-import com.robotium.solo.Solo;
-import com.robotium.solo.Timeout;
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Timeout;

 /**
 *  A convenient base class suitable for most Robocop tests.
--- a/mobile/android/tests/browser/robocop/ContentContextMenuTest.java
+++ b/mobile/android/tests/browser/robocop/ContentContextMenuTest.java
@ -9,7 +9,7 @@ import org.mozilla.gecko.util.Clipboard;

 import android.util.DisplayMetrics;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * This class covers interactions with the context menu opened from web content
--- a/mobile/android/tests/browser/robocop/UITest.java
+++ b/mobile/android/tests/browser/robocop/UITest.java
@ -6,7 +6,10 @@ package org.mozilla.gecko.tests;

 import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.Assert;
+import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.Driver;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.tests.components.AboutHomeComponent;
 import org.mozilla.gecko.tests.components.AppMenuComponent;
 import org.mozilla.gecko.tests.components.BaseComponent;
@ -15,7 +18,11 @@ import org.mozilla.gecko.tests.components.TabStripComponent;
 import org.mozilla.gecko.tests.components.ToolbarComponent;
 import org.mozilla.gecko.tests.helpers.HelperInitializer;

-import com.robotium.solo.Solo;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.text.TextUtils;
+
+import com.jayway.android.robotium.solo.Solo;

 /**
 * A base test class for Robocop (UI-centric) tests. This and the related classes attempt to
--- a/mobile/android/tests/browser/robocop/UITestContext.java
+++ b/mobile/android/tests/browser/robocop/UITestContext.java
@ -12,7 +12,7 @@ import org.mozilla.gecko.tests.components.BaseComponent;
 import android.app.Activity;
 import android.app.Instrumentation;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * Interface to the global information about a UITest environment.
--- a/mobile/android/tests/browser/robocop/components/AboutHomeComponent.java
+++ b/mobile/android/tests/browser/robocop/components/AboutHomeComponent.java
@ -22,8 +22,8 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * A class representing any interactions that take place on the Awesomescreen.
--- a/mobile/android/tests/browser/robocop/components/AppMenuComponent.java
+++ b/mobile/android/tests/browser/robocop/components/AppMenuComponent.java
@ -23,9 +23,9 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
-import com.robotium.solo.RobotiumUtils;
-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.RobotiumUtils;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * A class representing any interactions that take place on the app menu.
--- a/mobile/android/tests/browser/robocop/components/BaseComponent.java
+++ b/mobile/android/tests/browser/robocop/components/BaseComponent.java
@ -10,7 +10,7 @@ import org.mozilla.gecko.tests.UITestContext;

 import android.app.Activity;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * A base class for constructing components - an abstraction over small bits of Firefox
--- a/mobile/android/tests/browser/robocop/components/GeckoViewComponent.java
+++ b/mobile/android/tests/browser/robocop/components/GeckoViewComponent.java
@ -22,7 +22,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * A class representing any interactions that take place on GeckoView.
--- a/mobile/android/tests/browser/robocop/components/TabStripComponent.java
+++ b/mobile/android/tests/browser/robocop/components/TabStripComponent.java
@ -2,7 +2,7 @@ package org.mozilla.gecko.tests.components;

 import android.view.View;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.helpers.DeviceHelper;
--- a/mobile/android/tests/browser/robocop/components/ToolbarComponent.java
+++ b/mobile/android/tests/browser/robocop/components/ToolbarComponent.java
@ -10,6 +10,7 @@ import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
 import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;

 import org.mozilla.gecko.R;
+import org.mozilla.gecko.tests.StringHelper;
 import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.helpers.DeviceHelper;
 import org.mozilla.gecko.tests.helpers.NavigationHelper;
@ -21,8 +22,8 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * A class representing any interactions that take place on the Toolbar.
--- a/mobile/android/tests/browser/robocop/helpers/DeviceHelper.java
+++ b/mobile/android/tests/browser/robocop/helpers/DeviceHelper.java
@ -13,7 +13,7 @@ import android.app.Activity;
 import android.os.Build;
 import android.util.DisplayMetrics;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * Provides general hardware (ex: configuration) and software (ex: version) information
--- a/mobile/android/tests/browser/robocop/helpers/GeckoClickHelper.java
+++ b/mobile/android/tests/browser/robocop/helpers/GeckoClickHelper.java
@ -3,7 +3,7 @@ package org.mozilla.gecko.tests.helpers;
 import android.app.Activity;
 import android.util.DisplayMetrics;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 import org.mozilla.gecko.Driver;
 import org.mozilla.gecko.tests.StringHelper;
--- a/mobile/android/tests/browser/robocop/helpers/NavigationHelper.java
+++ b/mobile/android/tests/browser/robocop/helpers/NavigationHelper.java
@ -11,7 +11,7 @@ import org.mozilla.gecko.tests.UITestContext.ComponentType;
 import org.mozilla.gecko.tests.components.AppMenuComponent;
 import org.mozilla.gecko.tests.components.ToolbarComponent;

-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * Provides helper functionality for navigating around the Firefox UI. These functions will often
--- a/mobile/android/tests/browser/robocop/helpers/WaitHelper.java
+++ b/mobile/android/tests/browser/robocop/helpers/WaitHelper.java
@ -16,8 +16,8 @@ import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.UITestContext.ComponentType;
 import org.mozilla.gecko.tests.components.ToolbarComponent;

-import com.robotium.solo.Condition;
-import com.robotium.solo.Solo;
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Solo;

 /**
 * Provides functionality related to waiting on certain events to happen.
--- a/mobile/android/tests/browser/robocop/testANRReporter.java
+++ b/mobile/android/tests/browser/robocop/testANRReporter.java
@ -9,7 +9,7 @@ import org.mozilla.gecko.AppConstants;
 import android.content.Context;
 import android.content.Intent;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 import java.io.File;
 import java.io.FileReader;
--- a/mobile/android/tests/browser/robocop/testAddSearchEngine.java
+++ b/mobile/android/tests/browser/robocop/testAddSearchEngine.java
@ -19,7 +19,7 @@ import org.mozilla.gecko.R;
 import android.widget.ImageView;
 import android.widget.ListView;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * Test adding a search engine from an input field context menu.
--- a/mobile/android/tests/browser/robocop/testBookmark.java
+++ b/mobile/android/tests/browser/robocop/testBookmark.java
@ -4,7 +4,7 @@

 package org.mozilla.gecko.tests;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 public class testBookmark extends AboutHomeTest {
    private static String BOOKMARK_URL;
--- a/mobile/android/tests/browser/robocop/testBookmarkFolders.java
+++ b/mobile/android/tests/browser/robocop/testBookmarkFolders.java
@ -15,7 +15,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 public class testBookmarkFolders extends AboutHomeTest {
    private static String DESKTOP_BOOKMARK_URL;
--- a/mobile/android/tests/browser/robocop/testBookmarklets.java
+++ b/mobile/android/tests/browser/robocop/testBookmarklets.java
@ -10,7 +10,7 @@ import org.mozilla.gecko.home.HomePager;
 import android.database.Cursor;
 import android.widget.ListView;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;


 public class testBookmarklets extends AboutHomeTest {
--- a/mobile/android/tests/browser/robocop/testBrowserSearchVisibility.java
+++ b/mobile/android/tests/browser/robocop/testBrowserSearchVisibility.java
@ -8,7 +8,7 @@ import android.support.v4.app.Fragment;
 import android.view.KeyEvent;
 import android.view.View;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * Test for browser search visibility.
--- a/mobile/android/tests/browser/robocop/testClearPrivateData.java
+++ b/mobile/android/tests/browser/robocop/testClearPrivateData.java
@ -6,7 +6,7 @@ package org.mozilla.gecko.tests;

 import org.mozilla.gecko.R;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;
 import android.view.View;

 /**
--- a/mobile/android/tests/browser/robocop/testDoorHanger.java
+++ b/mobile/android/tests/browser/robocop/testDoorHanger.java
@ -6,7 +6,7 @@ package org.mozilla.gecko.tests;

 import android.widget.CheckBox;
 import android.view.View;
-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
--- a/mobile/android/tests/browser/robocop/testFindInPage.java
+++ b/mobile/android/tests/browser/robocop/testFindInPage.java
@ -15,7 +15,7 @@ import org.mozilla.gecko.util.GeckoEventListener;

 import org.json.JSONObject;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 public class testFindInPage extends JavascriptTest implements GeckoEventListener {
    private static final int WAIT_FOR_CONDITION_MS = 3000;
--- a/mobile/android/tests/browser/robocop/testGeckoRequest.java
+++ b/mobile/android/tests/browser/robocop/testGeckoRequest.java
@ -6,7 +6,7 @@ package org.mozilla.gecko.tests;

 import java.util.concurrent.atomic.AtomicBoolean;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.tests.helpers.AssertionHelper;
--- a/mobile/android/tests/browser/robocop/testGetUserMedia.java
+++ b/mobile/android/tests/browser/robocop/testGetUserMedia.java
@ -9,7 +9,7 @@ import org.mozilla.gecko.AppConstants;
 import android.widget.Spinner;
 import android.view.View;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 import android.hardware.Camera;
 import android.os.Build;
--- a/mobile/android/tests/browser/robocop/testHistory.java
+++ b/mobile/android/tests/browser/robocop/testHistory.java
@ -10,7 +10,7 @@ import android.widget.ListView;

 import org.mozilla.gecko.home.HomePager;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 public class testHistory extends AboutHomeTest {
    private View mFirstChild;
--- a/mobile/android/tests/browser/robocop/testImportFromAndroid.java
+++ b/mobile/android/tests/browser/robocop/testImportFromAndroid.java
@ -15,7 +15,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Browser;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
  * This test covers the Import from Android feature
--- a/mobile/android/tests/browser/robocop/testNewTab.java
+++ b/mobile/android/tests/browser/robocop/testNewTab.java
@ -8,8 +8,9 @@ import org.mozilla.gecko.Element;
 import org.mozilla.gecko.R;

 import android.app.Activity;
+import android.view.View;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /* A simple test that creates 2 new tabs and checks that the tab count increases. */
 public class testNewTab extends BaseTest {
--- a/mobile/android/tests/browser/robocop/testSearchSuggestions.java
+++ b/mobile/android/tests/browser/robocop/testSearchSuggestions.java
@ -12,7 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * Test for search suggestions.
--- a/mobile/android/tests/browser/robocop/testSessionOOMSave.java
+++ b/mobile/android/tests/browser/robocop/testSessionOOMSave.java
@ -2,7 +2,7 @@ package org.mozilla.gecko.tests;

 import org.mozilla.gecko.Actions;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * Tests session OOM save behavior.
--- a/mobile/android/tests/browser/robocop/testShareLink.java
+++ b/mobile/android/tests/browser/robocop/testShareLink.java
@ -18,7 +18,7 @@ import android.widget.GridView;
 import android.widget.ListView;
 import android.widget.TextView;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * This test covers the opening and content of the Share Link pop-up list
--- a/mobile/android/tests/browser/robocop/testStumblerSetting.java
+++ b/mobile/android/tests/browser/robocop/testStumblerSetting.java
@ -4,13 +4,14 @@
 package org.mozilla.gecko.tests;

 import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.mozstumbler.service.AppGlobals;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /*
 * This test enables (checkbox checked) the Fennec setting to contribute to MLS, then waits for
--- a/mobile/android/tests/browser/robocop/testThumbnails.java
+++ b/mobile/android/tests/browser/robocop/testThumbnails.java
@ -5,7 +5,7 @@ import org.mozilla.gecko.db.BrowserDB;
 import android.content.ContentResolver;
 import android.graphics.Color;

-import com.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Condition;

 /**
 * Test for thumbnail updates.