Merge "Update tests to wait and assert vs. immediately asserting" into main

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.LargeTest;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiObjectNotFoundException;

import androidx.test.uiautomator.Until;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.RootInfo;

            // Deselect the file and ensure the share menu disappears (this ensures the menu is

            // refreshed).

            bots.directory.selectDocument(fileName);

            onView(withId(R.id.action_menu_share)).check(doesNotExist());

            device.wait(Until.gone(By.desc("Share")), /* timeout= */ 5000);

        } finally {

            cleanupFile(fileName, primaryRoot.title);

        }

package com.android.documentsui;

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

import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;

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

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

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

        // Ensure the selection has cleared and the "1 file selected" text is not displayed.

        device.wait(Until.findObject(By.text(TestFilesRule.FILE_NAME_2).selected(false)), mTimeout);

        onView(withText("1 selected")).check(doesNotExist());

        device.wait(Until.gone(By.text("1 selected")), mTimeout);

    }

    @Test