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

Merge "16KB: Fix failing tests for AOSP targets" into main am: 62c017beb5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3455768

Change-Id: If65e7e554d6b2850436b09de06bb96ac3669fbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vilas Bhat
2025-01-22 14:21:32 -08:00
committed by Automerger Merge Worker
parent 06695ec0c3 62c017beb5
commit 78c5a735ad
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Enable16KbTests/test_16kb_app/src/com/android/settings/development/test/Enable16KbDeviceTest.java
View File

@@ -37,6 +37,8 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.util.Locale;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class Enable16KbDeviceTest { public class Enable16KbDeviceTest {
private static final long TIMEOUT = 2000; private static final long TIMEOUT = 2000;
@@ -92,7 +94,15 @@ public class Enable16KbDeviceTest {
// Verify that ext4 toggle is visible // Verify that ext4 toggle is visible
verifyTextOnScreen(EXT4_TITLE); verifyTextOnScreen(EXT4_TITLE);
mDevice.wait(Until.findObject(By.text(EXT4_CONFIRMATION)), TIMEOUT).click(); UiObject2 confirmationObject =
mDevice.wait(Until.findObject(By.text(EXT4_CONFIRMATION)), TIMEOUT);
if (confirmationObject == null) {
// Workaround for (b/390535191). AOSP targets display the string in all caps.
confirmationObject = mDevice.wait(
Until.findObject(By.text(EXT4_CONFIRMATION.toUpperCase(Locale.ROOT))), TIMEOUT);
}
assertTrue(confirmationObject != null);
confirmationObject.click();
} }
@Test @Test