From 69c5d2f4af6aebcca5053ca0587f662a8bdf05b9 Mon Sep 17 00:00:00 2001 From: Fangqiu Su Date: Tue, 19 Dec 2023 18:12:48 +0000 Subject: [PATCH] Update the imports to androidx.test.filters.* Bug: 316941721 Test: mmma . Change-Id: Id77c442066426ab52fb5c976f980a8881d0f8615 --- .../src/com/android/settings/ui/LocationSettingsTests.java | 2 +- .../com/android/settings/ui/MoreWirelessSettingsTest2.java | 4 ++-- .../com/android/settings/ui/MoreWirelessSettingsTests.java | 3 +-- .../com/android/settings/ui/NotificationSettingsTests.java | 2 +- .../src/com/android/settings/ui/SoundSettingsTest.java | 4 ++-- .../com/android/settings/ui/WirelessNetworkSettingsTests.java | 3 ++- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java index 3a9fa08cd16..da15c5662b5 100644 --- a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java @@ -21,8 +21,8 @@ import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.filters.MediumTest; import androidx.test.uiautomator.By; import androidx.test.uiautomator.Direction; import androidx.test.uiautomator.UiDevice; diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java index 4bd3cfbe8e8..2dfcbbeed68 100644 --- a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java +++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java @@ -23,10 +23,10 @@ import android.provider.Settings; import android.system.helpers.CommandsHelper; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; import androidx.test.uiautomator.By; import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.Direction; diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java index 25b47673e30..fd65b8377ee 100644 --- a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java @@ -21,15 +21,14 @@ import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.filters.MediumTest; import androidx.test.uiautomator.By; import androidx.test.uiautomator.Direction; import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; - public class MoreWirelessSettingsTests extends InstrumentationTestCase { private static final String SETTINGS_PACKAGE = "com.android.settings"; diff --git a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java index c1fd4defca1..b44f5ca2f3e 100644 --- a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java @@ -22,10 +22,10 @@ import android.provider.Settings; import android.system.helpers.ActivityHelper; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; import android.widget.ListView; +import androidx.test.filters.MediumTest; import androidx.test.uiautomator.By; import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.Direction; diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java index 3582a1d12a1..f981f7fe73e 100644 --- a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java @@ -22,9 +22,9 @@ import android.provider.Settings; import android.system.helpers.SettingsHelper; import android.system.helpers.SettingsHelper.SettingsType; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; import androidx.test.uiautomator.By; import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject2; diff --git a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java index d320e08183d..22c73a9d543 100644 --- a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java @@ -17,6 +17,7 @@ package com.android.settings.ui; import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; @@ -26,10 +27,10 @@ import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.system.helpers.CommandsHelper; import android.system.helpers.SettingsHelper; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; import androidx.test.uiautomator.By; import androidx.test.uiautomator.UiDevice;