Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5cfbe80 authored by Tony Wickham's avatar Tony Wickham
Browse files

Fix broken tests. 

- Missing a comma in one of the focus logic test matrices
- Disable QuickAddwidgetTest, because it isn't that useful and is
  flaky by nature.

Change-Id: Ia85fa578ea563ca525419b68ffcf90cfef8f86d0
parent b56090af

tests/src/com/android/launcher3/QuickAddWidgetTest.java

+7 −2
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ import java.util.List; 
 * Add an arbitrary widget from the widget picker very quickly to test potential race conditions.

 */

public class QuickAddWidgetTest extends InstrumentationTestCase {

    // Disabled because it's flaky and not particularly useful. But this class could still be useful

    // as an example if we want other UI tests in the future.

    private static final boolean DISABLED = true;



    private UiDevice mDevice;

    private String mTargetPackage;
@@ -38,14 +42,15 @@ public class QuickAddWidgetTest extends InstrumentationTestCase { 
    }



    public void testAddWidgetQuickly() throws Exception {

        if (DISABLED) return;

        mDevice.pressMenu(); // Enter overview mode.

        mDevice.wait(Until.findObject(By.text("Widgets")), 3000).click();

        UiObject2 calendarWidget = getWidgetByName("Calendar");

        UiObject2 calendarWidget = getWidgetByName("Clock");

        Point center = calendarWidget.getVisibleCenter();

        // Touch widget just long enough to pick it up (longPressTimeout), then let go immediately.

        getInstrumentation().sendPointerSync(MotionEvent.obtain(SystemClock.uptimeMillis(),

                SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, center.x, center.y, 0));

        Thread.sleep(ViewConfiguration.getLongPressTimeout());

        Thread.sleep(ViewConfiguration.getLongPressTimeout() + 50);

        getInstrumentation().sendPointerSync(MotionEvent.obtain(SystemClock.uptimeMillis(),

                SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, center.x, center.y, 0));

tests/src/com/android/launcher3/util/FocusLogicTest.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public final class FocusLogicTest extends AndroidTestCase { 
                { -1, -1, -1,  0, -1},

                {-11,-11,-11,-11,  2},

                { -1,  1, -1, -1, -1},

                { -1, -1  -1, -1, -1},

                { -1, -1, -1, -1, -1},

        });

        i = FocusLogic.handleKeyEvent(KeyEvent.KEYCODE_DPAD_LEFT, map, 0, 1, 1, true);

        assertEquals(1, i);