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

Commit 2a309b7f authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Update JUnit and InstrumentationRegistry imports 

This updates the deprecated imports of AndroidJUnit4 and
InstrumentationRegistry.

Flag: TEST_ONLY
Bug: 353661518
Test: atest
Change-Id: I4f2af2491fa45b28d3c557dae28fb78601c7ff54
parent 79302274

core/tests/InputMethodCoreTests/src/android/view/inputmethod/CursorAnchorInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; 


import android.graphics.Matrix;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/InputMethodCoreTests/src/android/view/inputmethod/DeleteRangeGestureTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNotNull; 
import android.graphics.RectF;

import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



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

core/tests/InputMethodCoreTests/src/android/view/inputmethod/EditorInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import android.util.StringBuilderPrinter; 
import android.view.MotionEvent;

import android.view.autofill.AutofillId;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/InputMethodCoreTests/src/android/view/inputmethod/InputMethodInfoTest.java

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.os.Bundle; 
import android.os.Parcel;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.frameworks.inputmethodcoretests.R;
@@ -135,7 +135,7 @@ public class InputMethodInfoTest { 


    private InputMethodInfo buildInputMethodForTest(final @XmlRes int metaDataRes)

            throws Exception {

        final Context context = InstrumentationRegistry.getContext();

        final Context context = InstrumentationRegistry.getInstrumentation().getContext();

        final ServiceInfo serviceInfo = new ServiceInfo();

        serviceInfo.applicationInfo = context.getApplicationInfo();

        serviceInfo.packageName = context.getPackageName();

core/tests/InputMethodCoreTests/src/android/view/inputmethod/InputMethodManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertNotNull; 
import android.content.Context;

import android.hardware.display.DisplayManager;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import org.junit.Test;

import org.junit.runner.RunWith;