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

Commit 147fc108 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-10eb3d835eca4319b6144c8f4c068e9c",...

Merge changes from topics "presubmit-am-10eb3d835eca4319b6144c8f4c068e9c", "presubmit-am-4b02653e83b548f494f92f7a023c91b9" into tm-dev am: 8459b0ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17667988



Change-Id: I11f4dac98ebaf0dccf20f9be34883e08e05db586
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d977863 8459b0ce
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;

@RootPermissionTest
@RunWith(AndroidJUnit4.class)
@@ -99,7 +100,9 @@ public final class NotificationTest {
    public void testDirectReply() {
        postMessagingNotification();
        mUiDevice.openNotification();
        mUiDevice.wait(Until.findObject(By.text(REPLY_ACTION_LABEL)), TIMEOUT).click();
        // The text can be shown as-is, or all-caps, depending on the system.
        Pattern actionLabelPattern = Pattern.compile(REPLY_ACTION_LABEL, Pattern.CASE_INSENSITIVE);
        mUiDevice.wait(Until.findObject(By.text(actionLabelPattern)), TIMEOUT).click();
        // Verify that IME is visible.
        assertThat(mUiDevice.wait(Until.findObject(By.pkg(getImePackage(mContext))), TIMEOUT))
                .isNotNull();