From 994fac6af45d063fa93ba012fcf17d59f99501a4 Mon Sep 17 00:00:00 2001
From: Andrej Rasevic <andrej@rasevicengineering.com>
Date: Mon, 28 Sep 2020 11:35:03 -0400
Subject: [PATCH] fixing permissions tests
---
.../course/labs/permissionslab/tests/TestGoToDangerousApp.kt | 5 +++--
.../java/course/labs/permissionslab/tests/TestPhoneStatus.kt | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
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 834c45a..90e66fd 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 0abcfa4..d39838c 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)
--
GitLab