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

Commit a7164bbb authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents 4c40fd30 69c5d2f4

tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java

+1 −2
Original line number Diff line number Diff line
@@ -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";

tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;