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

Commit bf16c2b3 authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "Prepare IME ConcurrentMultiUserTest to move to cts" into main

parents d9b7b1c3 b4262ef8

tests/inputmethod/ConcurrentMultiSessionImeTest/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <application>

        <uses-library android:name="android.test.runner" />

        <activity android:name=".MainActivity"

        <activity android:name=".ConcurrentMultiUserTestActivity"

                  android:theme="@android:style/Theme.Material.NoActionBar"

                  android:exported="true">

            <intent-filter>

tests/inputmethod/ConcurrentMultiSessionImeTest/res/layout/main_activity.xml→tests/inputmethod/ConcurrentMultiSessionImeTest/res/layout/concurrent_multi_user_test_activity.xml

+0 −0

File moved.

View file

tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTest.java

+9 −4
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ import androidx.test.core.app.ActivityScenario; 


import com.android.bedstead.harrier.BedsteadJUnit4;

import com.android.bedstead.harrier.DeviceState;

import com.android.bedstead.harrier.annotations.RequireAutomotive;

import com.android.bedstead.multiuser.annotations.RequireVisibleBackgroundUsers;

import com.android.compatibility.common.util.SystemUtil;



import org.junit.After;
@@ -63,6 +65,9 @@ import java.io.IOException; 
import java.util.List;



@RunWith(BedsteadJUnit4.class)

@RequireVisibleBackgroundUsers(reason = "This test requires a background visible user in addition"

        + " to the current visible user to test concurrent multi-user IME scenarios")

@RequireAutomotive(reason = "Visible background users are currently only supported on automotive")

public final class ConcurrentMultiUserTest {



    @ClassRule
@@ -71,14 +76,14 @@ public final class ConcurrentMultiUserTest { 


    private static final ComponentName TEST_ACTIVITY = new ComponentName(

            getInstrumentation().getTargetContext().getPackageName(),

            MainActivity.class.getName());

            ConcurrentMultiUserTestActivity.class.getName());

    private final Context mContext = getInstrumentation().getTargetContext();

    private final InputMethodManager mInputMethodManager =

            mContext.getSystemService(InputMethodManager.class);

    private final UiAutomation mUiAutomation = getInstrumentation().getUiAutomation();



    private ActivityScenario<MainActivity> mActivityScenario;

    private MainActivity mActivity;

    private ActivityScenario<ConcurrentMultiUserTestActivity> mActivityScenario;

    private ConcurrentMultiUserTestActivity mActivity;

    private int mPeerUserId;



    @Before
@@ -88,7 +93,7 @@ public final class ConcurrentMultiUserTest { 
        launchActivityAsUserSync(TEST_ACTIVITY, mPeerUserId);



        // Launch driver activity.

        mActivityScenario = ActivityScenario.launch(MainActivity.class);

        mActivityScenario = ActivityScenario.launch(ConcurrentMultiUserTestActivity.class);

        mActivityScenario.onActivity(activity -> mActivity = activity);

        mUiAutomation.adoptShellPermissionIdentity(INTERACT_ACROSS_USERS_FULL);

    }

tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/MainActivity.java→tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTestActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.compatibility.common.util.concurrentuser.ConcurrentUserActivi 
/**

 * An {@link Activity} to test multiple concurrent session IME.

 */

public final class MainActivity extends ConcurrentUserActivityBase {

public final class ConcurrentMultiUserTestActivity extends ConcurrentUserActivityBase {

    private static final String TAG = ConcurrentMultiUserTest.class.getSimpleName();

    private static final long WAIT_IME_TIMEOUT_MS = 3000;
@@ -55,7 +55,7 @@ public final class MainActivity extends ConcurrentUserActivityBase { 
        Log.v(TAG, "Create MainActivity as user "

                + Process.myUserHandle().getIdentifier() + " on display "

                + getDisplay().getDisplayId());

        setContentView(R.layout.main_activity);

        setContentView(R.layout.concurrent_multi_user_test_activity);

        mEditor = requireViewById(R.id.edit_text);

    }