Commit b268bdd6 authored Mar 02, 2025 by Ben Reich

Fix RenameDocumentUitest#testRenameFile_Cancel

For some reason the onView().perform() logic that is present in the
clickDialogCancelButton is not clicking the actual button. This is
leading to the test just leaving the dialog staying on the screen
and the test being unable to find the directoy list. Instead let's
update it to use UiObject2 and perform the click, this seems more
stable across Android versions.

Fix: 385439355
Bug: 394151244
Flag: EXEMPT test fix
Test: atest RenameDocumentUiTest#testRenameFile_Cancel
Change-Id: Ib86d26a2f9c1f1ed24ae9270d4c7b448be9267bc

parent 0525d8ce

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,8 @@ public class UiBot extends Bots.BaseBot {
		// Espresso has flaky results when keyboard shows up, so hiding it for now
		// before trying to click on any dialog button
		Espresso.closeSoftKeyboard();
		onView(withId(android.R.id.button2)).perform(click());
		UiObject2 okButton = mDevice.findObject(By.res("android:id/button2"));
		okButton.click();
		}

		public UiObject findMenuLabelWithName(String label) {