commit | f07785e04782cf650dafc14bcc1cad62160858a6 | [log] [tgz] |
---|---|---|
author | Eric Lin <ericth@google.com> | Thu Jul 25 15:38:06 2024 +0800 |
committer | Eric Lin <ericth@google.com> | Thu Jul 25 15:38:06 2024 +0800 |
tree | d593ce1a44477a6fc78a7472f36aadacd74083ca | |
parent | eb4760c4aa28721b1842357104126f5fc94bbdc2 [diff] |
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.hardware.display \ --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: I11bbdeef3eeaa89c3645a6059e0a29ba68d180bf
diff --git a/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java b/core/tests/coretests/src/android/hardware/display/AmbientBrightnessDayStatsTest.java index 0a25bd7..244024d 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 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 1c7ab74..9f12e51 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.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 969ae8e..5a0dacb 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.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;