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

Commit 78c5a735 authored by Vilas Bhat's avatar Vilas Bhat Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If65e7e554d6b2850436b09de06bb96ac3669fbb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06695ec0 62c017be

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

+11 −1
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.Locale;



@RunWith(AndroidJUnit4.class)

public class Enable16KbDeviceTest {

    private static final long TIMEOUT = 2000;
@@ -92,7 +94,15 @@ public class Enable16KbDeviceTest { 
        // Verify that ext4 toggle is visible

        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