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

Commit da662d55 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.security,com.android.internal.security \
 --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: I317707e51ba3503d579b6cf383b56d43d4864d2c
parent eb4760c4

core/tests/coretests/src/android/security/CredentialManagementAppTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import static org.junit.Assert.fail; 
import android.net.Uri;

import android.util.Xml;



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/security/keystore/recovery/KeyChainProtectionParamsTest.java

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


import android.os.Parcel;



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/security/keystore/recovery/KeyChainSnapshotTest.java

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


import android.os.Parcel;



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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.google.common.collect.Lists;

core/tests/coretests/src/android/security/keystore/recovery/KeyDerivationParamsTest.java

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


import android.os.Parcel;



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/security/keystore/recovery/RecoveryCertPathTest.java

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


import android.os.Parcel;



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;