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

Commit 331a11e0 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "TAPL: Little cleanup" into ub-launcher3-qt-dev

parents eb64fd39 41f93476

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+7 −10
Original line number Diff line number Diff line
@@ -541,25 +541,22 @@ public final class LauncherInstrumentation { 


    @NonNull

    UiObject2 waitForLauncherObject(String resName) {

        final BySelector selector = getLauncherObjectSelector(resName);

        final UiObject2 object = mDevice.wait(Until.findObject(selector), WAIT_TIME_MS);

        assertNotNull("Can't find a launcher object; selector: " + selector, object);

        return object;

        return waitForObjectBySelector(getLauncherObjectSelector(resName));

    }



    @NonNull

    UiObject2 waitForLauncherObjectByClass(String clazz) {

        final BySelector selector = getLauncherObjectSelectorByClass(clazz);

        final UiObject2 object = mDevice.wait(Until.findObject(selector), WAIT_TIME_MS);

        assertNotNull("Can't find a launcher object; selector: " + selector, object);

        return object;

        return waitForObjectBySelector(getLauncherObjectSelectorByClass(clazz));

    }



    @NonNull

    UiObject2 waitForFallbackLauncherObject(String resName) {

        final BySelector selector = getFallbackLauncherObjectSelector(resName);

        return waitForObjectBySelector(getFallbackLauncherObjectSelector(resName));

    }



    private UiObject2 waitForObjectBySelector(BySelector selector) {

        final UiObject2 object = mDevice.wait(Until.findObject(selector), WAIT_TIME_MS);

        assertNotNull("Can't find a fallback launcher object; selector: " + selector, object);

        assertNotNull("Can't find a launcher object; selector: " + selector, object);

        return object;

    }