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

Commit 11a6e05e authored by Eric Lin's avatar Eric Lin
Browse files

Replace deprecated AndroidJUnit4. 

AndroidJUnit4 from `androidx.test.runner` is deprecated, use
`androidx.test.ext.junit.runners.AndroidJUnit4` instead. See https://
developer.android.com/reference/androidx/test/runner/AndroidJUnit4 for
more details.

Bug: 354063239
Test: atest FrameworksCoreTests --\
 --module-arg FrameworksCoreTests:include-filter:android.accessibilityservice,android.view.accessibility,com.android.internal.accessibility \
 --module-arg FrameworksCoreTests:instrumentation-arg:annotation:=android.platform.test.annotations.Presubmit \
 --module-arg FrameworksCoreTests:instrumentation-arg:notAnnotation:=android.support.test.filters.FlakyTest,androidx.test.filters.FlakyTest
Flag: TEST_ONLY
Change-Id: I815535e51ad976bebd6d7a61ed344d217872d218
parent f93afffc

core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ import android.content.pm.PackageManager; 
import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityTestActivity;



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

import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.frameworks.coretests.R;

core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java

+1 −1
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ import android.util.SparseArray; 
import android.view.Display;

import android.view.View;



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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.google.common.base.Throwables;

core/tests/coretests/src/android/view/accessibility/AccessibilityEventTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import static junit.framework.Assert.assertTrue; 
import android.os.Parcel;

import android.view.Display;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import static org.mockito.MockitoAnnotations.initMocks; 
import android.os.Bundle;

import android.os.RemoteException;



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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import libcore.util.EmptyArray;

core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import android.view.Display; 


import androidx.annotation.NonNull;

import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

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



import com.android.internal.R;

import com.android.internal.accessibility.common.ShortcutConstants;