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

Commit 25bcaf2c 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.os,com.android.internal.os \
 --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: I7b8c8ff09ea4a75b1211abec5c0ebaa768eb6a45
parent f93afffc

core/tests/coretests/src/android/os/BinderDeathRecipientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.util.Log; 
import android.util.Pair;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

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



import com.android.frameworks.coretests.bdr_helper_app.TestCommsReceiver;

core/tests/coretests/src/android/os/BinderProxyCountingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.platform.test.ravenwood.RavenwoodRule; 
import android.util.Log;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.frameworks.coretests.aidl.IBpcCallbackObserver;

core/tests/coretests/src/android/os/BinderWorkSourceTest.java

+1 −2
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ import android.platform.test.annotations.Presubmit; 
import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.LargeTest;

import androidx.test.filters.Suppress;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/os/BluetoothBatteryStatsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.os; 


import static com.google.common.truth.Truth.assertThat;



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/os/BroadcasterTest.java

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


import android.platform.test.ravenwood.RavenwoodRule;



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

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;