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

Commit 14420376 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "No more IME tests from FrameworksServicesTests" into main

parents 6122227f 4a1cd8f7

services/tests/servicestests/src/com/android/server/inputmethod/InputMethodManagerServiceTests.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTests.java

+1 −10
Original line number Original line Diff line number Diff line
@@ -25,23 +25,14 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFI 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.fail;

import static org.junit.Assert.fail;





import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.inputmethod.SoftInputShowHideReason;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;





import java.io.PrintWriter;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.io.StringWriter;





@Presubmit

public final class InputMethodManagerServiceTests {

@SmallTest

@RunWith(AndroidJUnit4.class)

public class InputMethodManagerServiceTests {

    static final int SYSTEM_DECORATION_SUPPORT_DISPLAY_ID = 2;

    static final int SYSTEM_DECORATION_SUPPORT_DISPLAY_ID = 2;

    static final int NO_SYSTEM_DECORATION_SUPPORT_DISPLAY_ID = 3;

    static final int NO_SYSTEM_DECORATION_SUPPORT_DISPLAY_ID = 3;

services/tests/servicestests/src/com/android/server/inputmethod/InputMethodSettingsTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodSettingsTest.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -22,14 +22,9 @@ import android.text.TextUtils; 
import android.util.IntArray;

import android.util.IntArray;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;





@SmallTest

@RunWith(AndroidJUnit4.class)

public final class InputMethodSettingsTest {

public final class InputMethodSettingsTest {

    private static void verifyUpdateEnabledImeString(@NonNull String expectedEnabledImeStr,

    private static void verifyUpdateEnabledImeString(@NonNull String expectedEnabledImeStr,

            @NonNull String initialEnabledImeStr, @NonNull String imeId,

            @NonNull String initialEnabledImeStr, @NonNull String imeId,