diff options
| author | 2024-07-29 09:25:58 +0000 | |
|---|---|---|
| committer | 2024-07-29 09:25:58 +0000 | |
| commit | 71724c7f6431d1a7cbacc2bbc30bca842b9d51fd (patch) | |
| tree | 0ee5e9fd6ff33aa6755727b99d3a7a8446f04bf8 | |
| parent | f34ef4fcaeddf6bf86baa7d09b60aa84771691d2 (diff) | |
| parent | f07785e04782cf650dafc14bcc1cad62160858a6 (diff) | |
Merge "Replace deprecated AndroidJUnit4." into main
3 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java b/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java index 0a25bd7e3f2c..244024da89b3 100644 --- a/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java +++ b/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java @@ -24,8 +24,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; diff --git a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java index 1c7ab7428ee7..9f12e5121999 100644 --- a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java +++ b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java @@ -25,8 +25,8 @@ import android.os.Parcel; import android.util.Pair; import android.util.Xml; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; diff --git a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java index 969ae8e819da..5a0dacb38865 100644 --- a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java +++ b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java @@ -31,8 +31,8 @@ import android.platform.test.annotations.Presubmit; import android.view.DisplayInfo; 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; |