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

Commit 5aa1aed4 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.content,com.android.internal.content \
 --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: I8b07cb267533d0b75cda766ccb971c81fc19b153
parent eb4760c4

core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.content; 


import static org.junit.Assert.fail;

import static org.junit.Assume.assumeTrue;

import org.junit.Ignore;



import android.app.ActivityManager;

import android.app.activity.LocalProvider;
@@ -33,13 +32,14 @@ import android.os.UserHandle; 
import android.os.UserManager;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



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



import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/content/ApexEnvironmentTest.java

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


import android.os.UserHandle;



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/content/BroadcastReceiverTests.java

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.content; 
import static org.junit.Assert.fail;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/content/ContentProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.net.Uri; 
import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/content/ContentResolverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import android.platform.test.annotations.Presubmit; 
import android.util.Size;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

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



import org.junit.After;

import org.junit.Before;