diff --git a/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestGoToDangerousApp.kt b/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestGoToDangerousApp.kt index 834c45a6405b398c19d997328f0e062710484f05..90e66fd18b244250e3e1d6511adfd53c5b109b4f 100644 --- a/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestGoToDangerousApp.kt +++ b/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestGoToDangerousApp.kt @@ -68,8 +68,9 @@ class TestGoToDangerousApp { assertNotNull("GoToDangerousActivity Didn't start", startDangerousApp) startDangerousApp.click() // - val PermissionDialog = mDevice!!.wait(Until.findObject(By.text("ALLOW")), 2000) - PermissionDialog?.click() + val allowButtonPattern = Pattern.compile("ALLOW", Pattern.CASE_INSENSITIVE) + val permissionDialog = mDevice!!.wait(Until.findObject(By.text(allowButtonPattern)), 2000) + permissionDialog?.click() val phoneNumber = mDevice!!.wait(Until.findObject(By.text("You have opened a dangerous activity")), 5000) assertNotNull(phoneNumber) } diff --git a/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestPhoneStatus.kt b/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestPhoneStatus.kt index 0abcfa479e0606f047d5d2f3bed217691b07003a..d39838c4d473f6de5c097334b443b61f5ba58c9d 100644 --- a/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestPhoneStatus.kt +++ b/labs/Lab3_Permissions/app/src/androidTest/java/course/labs/permissionslab/tests/TestPhoneStatus.kt @@ -67,8 +67,9 @@ class TestPhoneStatus { @Test fun testPermissionRequested() { - val PermissionDialog = mDevice!!.wait(Until.findObject(By.text("ALLOW")), 2000) - PermissionDialog?.click() + val allowButtonPattern = Pattern.compile("ALLOW", Pattern.CASE_INSENSITIVE) + val permissionDialog = mDevice!!.wait(Until.findObject(By.text(allowButtonPattern)), 2000) + permissionDialog?.click() val phonePattern = Pattern.compile("Phone Number: \\+?\\d+") val phoneNumber = mDevice!!.wait(Until.findObject(By.text(phonePattern)), 5000) assertNotNull(phoneNumber)