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

Commit 1d2929ed 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: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: Ided4d4fd5c29fbaab1968a839bac4646e81c21e7
parent 92ab503d

core/tests/coretests/src/android/animation/ValueAnimatorTests.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,9 +30,9 @@ import android.os.SystemClock; 
import android.view.Choreographer;

import android.view.Choreographer;

import android.view.animation.LinearInterpolator;

import android.view.animation.LinearInterpolator;





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

import androidx.test.filters.MediumTest;

import androidx.test.filters.MediumTest;

import androidx.test.rule.ActivityTestRule;

import androidx.test.rule.ActivityTestRule;

import androidx.test.runner.AndroidJUnit4;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

core/tests/coretests/src/android/companion/virtual/audio/VirtualAudioSessionTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ import android.media.AudioRecordingConfiguration; 
import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

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





import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Rule;

core/tests/coretests/src/android/hardware/input/InputFlagsTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ import static com.android.hardware.input.Flags.keyboardLayoutPreviewFlag; 




import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;





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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/preference/PreferenceIconSpaceTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,8 +27,8 @@ import android.view.ViewGroup; 
import android.widget.ImageView;

import android.widget.ImageView;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

core/tests/coretests/src/android/print/IPrintManagerParametersTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,9 +42,9 @@ import android.print.test.services.PrinterDiscoverySessionCallbacks; 
import android.print.test.services.StubbablePrinterDiscoverySession;

import android.print.test.services.StubbablePrinterDiscoverySession;

import android.printservice.recommendation.IRecommendationsChangeListener;

import android.printservice.recommendation.IRecommendationsChangeListener;





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

import androidx.test.filters.LargeTest;

import androidx.test.filters.LargeTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiDevice;





import org.junit.Before;

import org.junit.Before;