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

Commit ebed4c42 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.app,com.android.internal.app \
 --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: I59ff04dec8c3b26cb6a51c9695a7c4feda54f50c
parent f93afffc

core/tests/coretests/src/android/app/ActivityManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; 
import android.os.UserHandle;

import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Rule;

import org.junit.Test;

core/tests/coretests/src/android/app/ApplicationErrorReportTest.java

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


import android.app.ApplicationErrorReport.CrashInfo;



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/coretests/src/android/app/ApplicationLoadersTest.java

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


import android.content.pm.SharedLibraryInfo;



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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.google.android.collect.Lists;

core/tests/coretests/src/android/app/BackgroundStartPrivilegesTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import static com.google.common.truth.Truth.assertThat; 
import android.os.Binder;

import android.os.IBinder;



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/coretests/src/android/app/LoaderLifecycleTest.java

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.os.Handler; 
import android.os.Parcelable;

import android.util.ArrayMap;



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

import androidx.test.filters.MediumTest;

import androidx.test.rule.ActivityTestRule;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;