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

Commit d11b604e authored by vadimt's avatar vadimt
Browse files

Converting some tests to TAPL 

Change-Id: I1b67f80d9d61792d5795f9638bf9d19919f36d39
parent 715de78e

tests/src/com/android/launcher3/ui/TestViewHelpers.java

+0 −15
Original line number Diff line number Diff line
@@ -54,21 +54,6 @@ public class TestViewHelpers { 
        return UiDevice.getInstance(getInstrumentation());

    }



    /**

     * Opens all apps and returns the recycler view

     */

    public static UiObject2 openAllApps() {

        final UiDevice device = getDevice();

        device.waitForIdle();

        UiObject2 hotseat = device.wait(

                Until.findObject(getSelectorForId(R.id.hotseat)), 2500);

        Point start = hotseat.getVisibleCenter();

        int endY = (int) (device.getDisplayHeight() * 0.1f);

        // 100 px/step

        device.swipe(start.x, start.y, start.x, endY, (start.y - endY) / 100);

        return findViewById(R.id.apps_list_view);

    }



    public static UiObject2 findViewById(int id) {

        return getDevice().wait(Until.findObject(getSelectorForId(id)),

                AbstractLauncherUiTest.DEFAULT_UI_TIMEOUT);

tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java

+5 −6
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.launcher3.testcomponent.AppWidgetNoConfig; 
import com.android.launcher3.testcomponent.AppWidgetWithConfig;

import com.android.launcher3.testcomponent.RequestPinItemActivity;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.ui.TestViewHelpers;

import com.android.launcher3.util.Condition;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.ShellCommandRule;
@@ -149,14 +148,14 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { 
        clearHomescreen();

        mActivityMonitor.startLauncher();



        // Open all apps and wait for load complete

        final UiObject2 appsContainer = TestViewHelpers.openAllApps();

        Wait.atMost(null, Condition.minChildCount(appsContainer, 2), DEFAULT_UI_TIMEOUT);



        // Open Pin item activity

        BlockingBroadcastReceiver openMonitor = new BlockingBroadcastReceiver(

                RequestPinItemActivity.class.getName());

        scrollAndFind(appsContainer, By.text("Test Pin Item")).click();

        mLauncher.

                getWorkspace().

                switchToAllApps().

                getAppIcon("Test Pin Item").

                launch("com.google.android.apps.nexuslauncher.tests");

        assertNotNull(openMonitor.blockingGetExtraIntent());



        // Set callback