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

Commit d2d68c14 authored by Ben Reich's avatar Ben Reich
Browse files

Ensure we type text into the search box instead of setting it 

A previous change to make the search tests more robust ended up using
setText instead of typeText. This has the unfortunate side effect of not
focusing on the search text and thus failing the test when trying to
assert that search icon is visible on slower devices as it closes the
app. Ensure the view wait code is there but also move back to typing in
the text box instead.

This also inlines the SEARCH_INPUT variable as it was only used in one
place and with the addition of the docked search bar it would require
two of them and thus makes no sense to keep around.

Fix: 418404084
Flag: EXEMPT test fix
Test: atest com.android.documentsui.SearchViewUiTest
Change-Id: I85080149f68eaf015e075d8e477e3145c7f0f8f6
parent f78ff54d

tests/common/com/android/documentsui/bots/SearchBot.java

+7 −13
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.documentsui.bots;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.typeText;

import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;

import static androidx.test.espresso.matcher.ViewMatchers.isClickable;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -35,7 +37,6 @@ import androidx.test.uiautomator.By; 
import androidx.test.uiautomator.BySelector;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.UiObjectNotFoundException;

import androidx.test.uiautomator.UiSelector;

import androidx.test.uiautomator.Until;
@@ -58,14 +59,6 @@ public class SearchBot extends Bots.BaseBot { 
            withId(R.id.option_menu_search),

            anyOf(isClickable(), hasDescendant(isClickable())));



    // Note that input is visible when the clicky button is not

    // present. So to clearly qualify the two...we explicitly

    // require this input be not clickable.

    @SuppressWarnings("unchecked")

    private static final Matcher<View> SEARCH_INPUT = allOf(

            withId(androidx.appcompat.R.id.search_src_text),

            isDisplayed());



    public SearchBot(UiDevice device, Context context, int timeout) {

        super(device, context, timeout);

    }
@@ -101,12 +94,13 @@ public class SearchBot extends Bots.BaseBot { 
    public void setInputText(String query) throws UiObjectNotFoundException {

        if (!showsDockedSearch()) {

            BySelector selector = By.res(mTargetPackage + ":id/search_src_text");

            UiObject2 searchInput = mDevice.wait(Until.findObject(selector), 5000);

            searchInput.setText(query);

            mDevice.wait(Until.findObject(selector), 5000);

            onView(allOf(withId(androidx.appcompat.R.id.search_src_text), isDisplayed()))

                    .perform(typeText(query));

        } else {

            BySelector selector = By.res(mTargetPackage + ":id/docked_search_text");

            UiObject2 searchInput = mDevice.wait(Until.findObject(selector), 5000);

            searchInput.setText(query);

            mDevice.wait(Until.findObject(selector), 5000);

            onView(allOf(withId(R.id.docked_search_text), isDisplayed())).perform(typeText(query));

        }

    }