backout of 1e2283f6856c (Bug 822385) for failing robocop tests CLOSED TREE
authorJoel Maher <jmaher@mozilla.com>
Thu, 20 Dec 2012 11:59:46 -0500
changeset 125738 8a7b7f1ac53ace630e6f49c87bcdb3c465c5a00d
parent 125737 f042470c7ae896887b25beacf64d3cf3abeadb1a
child 125739 868b21bed3eb74c0c998eac9bcb600e71566245a
child 125787 15f4b624bc3a14aa4934f96b5e455fcac299a647
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs822385
milestone20.0a1
backs out1e2283f6856c629369358bbbe4f9b6f53192ba0f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout of 1e2283f6856c (Bug 822385) for failing robocop tests CLOSED TREE
mobile/android/base/tests/BaseTest.java.in
mobile/android/base/tests/testAwesomebarSwipes.java.in
--- a/mobile/android/base/tests/BaseTest.java.in
+++ b/mobile/android/base/tests/BaseTest.java.in
@@ -70,21 +70,16 @@ abstract class BaseTest extends Activity
     public BaseTest() {
         super(TARGET_PACKAGE_ID, mLauncherActivityClass);
     }
 
     protected abstract int getTestType();
 
     @Override
     protected void setUp() throws Exception {
-
-        // This is required for us to pass testBookmarklets, otherwise we fail either with
-        // StrictMode or something related to sending the ENTER key
-        int applicationFlags = getActivity().getApplicationInfo().flags;
-
         // Load config file from root path (setup by python script)
         String rootPath = FennecInstrumentationTestRunner.getArguments().getString("deviceroot");
         String configFile = FennecNativeDriver.getFile(rootPath + "/robotium.config");
         HashMap config = FennecNativeDriver.convertTextToTable(configFile);
 
         // Create the intent to be used with all the important arguments.
         Intent i = new Intent(Intent.ACTION_MAIN);
         mProfile = (String)config.get("profile");
--- a/mobile/android/base/tests/testAwesomebarSwipes.java.in
+++ b/mobile/android/base/tests/testAwesomebarSwipes.java.in
@@ -29,22 +29,20 @@ public class testAwesomebarSwipes extend
         mActions.expectGeckoEvent("Gecko:Ready").blockForEvent();
 
         ListView list = getAllPagesList("about:firefox");
 
         // Test normal sliding of the list left and right
         ViewPager pager = (ViewPager)mSolo.getView(ViewPager.class, 0);
         mAsserter.is(pager.getCurrentItem(), 0, "All pages is selected");
 
-        int midx = mDriver.getGeckoWidth() / 2;
-        int midy = mDriver.getGeckoHeight() / 2;
-        mActions.drag(midx, 0, midy, midy);
+        mSolo.scrollToSide(Solo.RIGHT);
         mAsserter.is(pager.getCurrentItem(), 1, "Bookmarks page is selected");
 
-        mActions.drag(0, midx, midy, midy);
+        mSolo.scrollToSide(Solo.LEFT);
         mAsserter.is(pager.getCurrentItem(), 0, "All pages is selected");
 
         // Test tapping on the tab strip changes tabs
         TabWidget tabwidget = (TabWidget)mSolo.getView(TabWidget.class, 0);
         mSolo.clickOnView(tabwidget.getChildAt(1));
         mAsserter.is(pager.getCurrentItem(), 1, "Clicking on tab selected bookmarks page");
 
         // Test typing in the awesomebar changes tabs and prevents panning