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

Commit a0e87996 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.util,com.android.internal.util \
 --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: I26b86b91f1fc52ab5c0afab5f54153e545793085
parent f93afffc

core/tests/coretests/src/android/util/ArrayMapTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ import static org.junit.Assert.fail; 
import android.platform.test.annotations.IgnoreUnderRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;



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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;

core/tests/coretests/src/android/util/ArraySetTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.util; 


import static org.junit.Assert.fail;



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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Test;

core/tests/coretests/src/android/util/Base64Test.java

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

import static org.junit.Assert.fail;



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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Ignore;

import org.junit.Test;

core/tests/coretests/src/android/util/BinaryXmlTest.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG; 


import android.os.PersistableBundle;



import androidx.test.runner.AndroidJUnit4;

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



import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

core/tests/coretests/src/android/util/CharsetUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; 
import android.platform.test.annotations.IgnoreUnderRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.runner.AndroidJUnit4;

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



import com.android.internal.util.HexDump;