Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b5a88815b3a6 (bug 1396951)

Browse Source 
MozReview-Commit-ID: H7q7JLdOCQS
This commit is contained in:
Sebastian Hengst 2017-09-22 11:48:25 +02:00
parent ee050c207e
commit e6da11dbfd
7 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/FennecNativeActions.java
View File

@ -356,7 +356,7 @@ public class FennecNativeActions implements Actions {
PaintExpecter() {
final PaintExpecter expecter = this;
mLayerView = (LayerView) mSolo.getView(R.id.layer_view);
mLayerView = GeckoAppShell.getLayerView();
mDrawListener = new DrawListener() {
@Override
public void drawFinished() {

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
View File

@ -356,8 +356,7 @@ abstract class BaseTest extends BaseRobocopTest {
// If we don't see the item, scroll down once in case it's off-screen.
// Hacky way to scroll down. solo.scroll* does not work in dialogs.
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mSolo,
mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
meh.dragSync(mScreenMidWidth, mScreenMidHeight+100, mScreenMidWidth, mScreenMidHeight-100);
foundText = mSolo.waitForText(txt);

10
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/MotionEventHelper.java
View File

@ -5,11 +5,8 @@
package org.mozilla.gecko.tests;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.PrefsHelper;
import org.mozilla.gecko.R;
import org.mozilla.gecko.gfx.LayerView;
import com.robotium.solo.Solo;
import org.mozilla.gecko.PrefsHelper;
import android.app.Instrumentation;
import android.os.SystemClock;
@ -29,12 +26,11 @@ class MotionEventHelper {
private float mTouchStartTolerance;
private final int mDpi;
public MotionEventHelper(Instrumentation inst, Solo solo,
int surfaceOffsetX, int surfaceOffsetY) {
public MotionEventHelper(Instrumentation inst, int surfaceOffsetX, int surfaceOffsetY) {
mInstrumentation = inst;
mSurfaceOffsetX = surfaceOffsetX;
mSurfaceOffsetY = surfaceOffsetY;
layerView = (LayerView) solo.getView(R.id.layer_view);
layerView = GeckoAppShell.getLayerView();
mApzEnabled = false;
mTouchStartTolerance = 0.0f;
mDpi = GeckoAppShell.getDpi();

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testAxisLocking.java
View File

@ -19,8 +19,7 @@ public class testAxisLocking extends PixelTest {
public void testAxisLocking() {
String url = getAbsoluteUrl(mStringHelper.ROBOCOP_BOXES_URL);
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mSolo,
mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
blockForGeckoReady();

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testFlingCorrectness.java
View File

@ -17,8 +17,7 @@ public class testFlingCorrectness extends PixelTest {
public void testFlingCorrectness() {
String url = getAbsoluteUrl(mStringHelper.ROBOCOP_BOXES_URL);
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mSolo,
mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
blockForGeckoReady();

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testPanCorrectness.java
View File

@ -17,8 +17,7 @@ public class testPanCorrectness extends PixelTest {
public void testPanCorrectness() {
String url = getAbsoluteUrl(mStringHelper.ROBOCOP_BOXES_URL);
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mSolo,
mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
blockForGeckoReady();

3
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testVkbOverlap.java
View File

@ -29,8 +29,7 @@ public class testVkbOverlap extends PixelTest {
// scroll to the bottom of the page and let it settle
Actions.RepeatedEventExpecter paintExpecter = mActions.expectPaint();
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mSolo,
mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventHelper meh = new MotionEventHelper(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
meh.dragSync(10, 150, 10, 50);
// the input field has a green background, so let's count the number of green pixels