joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Update uiautomator references in packages/modules/Connectivity/tests/cts/hostside/app"

Browse source
This commit is contained in:
Yichun Li 2023-05-08 19:29:49 +00:00 • committed by Gerrit Code Review
commit 043c7f07e4
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/cts/hostside/app/Android.bp
View file

@ -30,7 +30,6 @@ java_defaults {
"cts-net-utils",
"ctstestrunner-axt",
"modules-utils-build",
"ub-uiautomator",
],
libs: [
"android.test.runner",

12
tests/cts/hostside/app/src/com/android/cts/net/hostside/DataWarningReceiverTest.java
View file

@ -19,18 +19,18 @@ package com.android.cts.net.hostside;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.clearSnoozeTimestamps;
import android.content.pm.PackageManager;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.Direction;
import android.support.test.uiautomator.UiObject2;
import android.support.test.uiautomator.Until;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionPlan;
import androidx.test.platform.app.InstrumentationRegistry;
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;
import com.android.compatibility.common.util.SystemUtil;
import com.android.compatibility.common.util.UiAutomatorUtils;
import com.android.compatibility.common.util.UiAutomatorUtils2;
import org.junit.After;
import org.junit.Assume;
@ -84,7 +84,7 @@ public class DataWarningReceiverTest extends AbstractRestrictBackgroundNetworkTe
final UiDevice uiDevice = UiDevice.getInstance(mInstrumentation);
uiDevice.openNotification();
try {
final UiObject2 uiObject = UiAutomatorUtils.waitFindObject(
final UiObject2 uiObject = UiAutomatorUtils2.waitFindObject(
By.text("Data warning"));
Assume.assumeNotNull(uiObject);
uiObject.wait(Until.clickable(true), 10_000L);

6
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View file

@ -100,9 +100,6 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.provider.Settings;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject;
import android.support.test.uiautomator.UiSelector;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
@ -114,6 +111,9 @@ import android.util.Log;
import android.util.Range;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject;
import androidx.test.uiautomator.UiSelector;
import com.android.compatibility.common.util.BlockingBroadcastReceiver;
import com.android.modules.utils.build.SdkLevel;