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

Commit 9b74ec6f authored by Kohsuke Yatoh's avatar Kohsuke Yatoh Committed by Automerger Merge Worker
Browse files

Merge "Unlock screen before test runs." into tm-dev am: 62b46c64 am: 8c2974fb 

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



Change-Id: Ie613829bec690b83f8ec5cc8ad4f2f4b73529f76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f56df618 8c2974fb

tests/InputMethodStressTest/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ android_test { 
        "androidx.test.uiautomator_uiautomator",

        "compatibility-device-util-axt",

        "platform-test-annotations",

        "platform-test-rules",

        "truth-prebuilt",

    ],

    test_suites: [

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/AutoShowTest.java

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.app.Instrumentation; 
import android.content.Intent;

import android.os.Bundle;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.widget.EditText;

import android.widget.LinearLayout;
@@ -36,6 +37,7 @@ import androidx.annotation.Nullable; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -43,6 +45,9 @@ import org.junit.runner.RunWith; 
@RunWith(AndroidJUnit4.class)

public final class AutoShowTest {



    @Rule

    public UnlockScreenRule mUnlockScreenRule = new UnlockScreenRule();



    @Test

    public void autoShow() {

        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.os.SystemClock;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.view.WindowInsets;

import android.view.WindowInsetsAnimation;

import android.view.inputmethod.InputMethodManager;
@@ -39,6 +40,7 @@ import androidx.annotation.Nullable; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -50,6 +52,9 @@ public final class ImeOpenCloseStressTest { 


    private static final int NUM_TEST_ITERATIONS = 10;



    @Rule

    public UnlockScreenRule mUnlockScreenRule = new UnlockScreenRule();



    @Test

    public void test() {

        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.Context; 
import android.content.Intent;

import android.graphics.drawable.Icon;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.provider.Settings;

import android.view.KeyEvent;
@@ -42,6 +43,7 @@ import androidx.test.uiautomator.Until; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -70,6 +72,9 @@ public final class NotificationTest { 
    private static final BySelector REPLY_SEND_BUTTON_SELECTOR =

            By.res("com.android.systemui", "remote_input_send");



    @Rule

    public UnlockScreenRule mUnlockScreenRule = new UnlockScreenRule();



    private Context mContext;

    private NotificationManager mNotificationManager;

    private UiDevice mUiDevice;