Merge "Fix IncomingFileConfirmActivityTest failure in small screen" into main (b0e928a4) · Commits · e / os / android_packages_modules_Bluetooth

android/app/tests/unit/src/com/android/bluetooth/opp/IncomingFileConfirmActivityTest.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import android.view.KeyEvent;

		import androidx.lifecycle.Lifecycle;
		import androidx.test.core.app.ActivityScenario;
		import androidx.test.espresso.action.ViewActions;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;

		@@ -160,6 +161,9 @@ public class IncomingFileConfirmActivityTest {
		// The dialog button is clicked (no error throw) but onClick() is not triggered.
		// It works normally if sleep for a few seconds
		Thread.sleep(TIMEOUT_MS);
		onView(withText(mTargetContext.getText(R.string.incoming_file_confirm_cancel).toString()))
		.inRoot(isDialog())
		.perform(ViewActions.scrollTo());
		onView(withText(mTargetContext.getText(R.string.incoming_file_confirm_cancel).toString()))
		.inRoot(isDialog()).check(matches(isDisplayed())).perform(click());

		@@ -181,6 +185,9 @@ public class IncomingFileConfirmActivityTest {
		// The dialog button is clicked (no error throw) but onClick() is not triggered.
		// It works normally if sleep for a few seconds
		Thread.sleep(TIMEOUT_MS);
		onView(withText(mTargetContext.getText(R.string.incoming_file_confirm_ok).toString()))
		.inRoot(isDialog())
		.perform(ViewActions.scrollTo());
		onView(withText(mTargetContext.getText(R.string.incoming_file_confirm_ok).toString()))
		.inRoot(isDialog()).check(matches(isDisplayed())).perform(click());