PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DevelopmentSettingsTest

Browse Source 
And MoreWirelessSettingsTests.testVPNMenuLoad

Bug: 290684887
Test: ui test
Change-Id: I37ef70d1f6f75cd1721ab9ba0763f7ec20be80d0
This commit is contained in:
Chaohui Wang
2023-09-12 21:50:14 +08:00
parent d835649147
commit 5b439a3f44
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/uitests/src/com/android/settings/ui/DevelopmentSettingsTest.kt
View File

@@ -16,13 +16,14 @@
package com.android.settings.ui package com.android.settings.ui
import android.os.SystemClock
import android.provider.Settings import android.provider.Settings
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.By
import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiDevice
import com.android.settings.ui.testutils.SettingsTestUtils.assertHasTexts import com.android.settings.ui.testutils.SettingsTestUtils.assertHasTexts
import com.android.settings.ui.testutils.SettingsTestUtils.clickObject
import com.android.settings.ui.testutils.SettingsTestUtils.startMainActivityFromHomeScreen import com.android.settings.ui.testutils.SettingsTestUtils.startMainActivityFromHomeScreen
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
@@ -35,8 +36,11 @@ class DevelopmentSettingsTest {
@Before @Before
fun setUp() { fun setUp() {
device.executeShellCommand("settings put global development_settings_enabled 1") device.startMainActivityFromHomeScreen(Settings.ACTION_DEVICE_INFO_SETTINGS)
SystemClock.sleep(1000) device.assertHasTexts(listOf(BUILD_NUMBER))
repeat(7) { // Enable development mode
device.clickObject(By.text(BUILD_NUMBER))
}
device.startMainActivityFromHomeScreen(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS) device.startMainActivityFromHomeScreen(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)
} }
@@ -46,6 +50,7 @@ class DevelopmentSettingsTest {
} }
private companion object { private companion object {
private const val BUILD_NUMBER = "Build number"
val ON_SCREEN_TEXTS = listOf( val ON_SCREEN_TEXTS = listOf(
"Use developer options", "Use developer options",
"Memory", "Memory",

5
tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java
View File

@@ -24,6 +24,7 @@ import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.MediumTest;
import androidx.test.uiautomator.By; import androidx.test.uiautomator.By;
import androidx.test.uiautomator.Direction;
import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.UiObject2;
import androidx.test.uiautomator.Until; import androidx.test.uiautomator.Until;
@@ -86,8 +87,8 @@ public class MoreWirelessSettingsTests extends InstrumentationTestCase {
public void testVPNMenuLoad() throws Exception { public void testVPNMenuLoad() throws Exception {
SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
Settings.ACTION_WIRELESS_SETTINGS); Settings.ACTION_WIRELESS_SETTINGS);
mDevice.wait(Until mDevice.findObject(By.res(SETTINGS_PACKAGE, "main_content"))
.findObject(By.text("VPN")), TIMEOUT) .scrollUntil(Direction.DOWN, Until.findObject(By.text("VPN")))
.click(); .click();
Thread.sleep(TIMEOUT); Thread.sleep(TIMEOUT);
UiObject2 usbTethering = mDevice.wait(Until UiObject2 usbTethering = mDevice.wait(Until