Merge "Merge "Merge "Google RCS uses FTEU MO SMS for phone number verification Test Cases [ Week 12, Week 13 Week 14 and Week 15]" into android10-tests-dev am: 4e44fa4aa3" into android11-tests-dev am: 4f0f93d77a" into android12-tests-devandroid12-tests-dev

1 files changed, 15 insertions, 4 deletions

diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
index 3ca372cf8f3..aceba312b28 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
@@ -143,6 +143,10 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("br", "2654", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("br", "2652", SMS_CATEGORY_FREE_SHORT_CODE),
 
+            new ShortCodeTest("bw", "166416", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("bw", "16649", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("bw", "16641", SMS_CATEGORY_FREE_SHORT_CODE),
+
             new ShortCodeTest("by", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("by", "1234", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("by", "3336", SMS_CATEGORY_PREMIUM_SHORT_CODE),
@@ -225,6 +229,7 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("do", "9128922", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("do", "912898", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("do", "912892", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("do", "912", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("ec", "4664534", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("ec", "466499", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
@@ -291,9 +296,10 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("ge", "95208", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("ge", "952014", SMS_CATEGORY_NOT_SHORT_CODE),
 
-            new ShortCodeTest("gh", "377789", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("gh", "37778", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("gh", "3775", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("gh", "3777", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("gh", "2333", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("gr", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("gr", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -393,6 +399,7 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("kw", "509761", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("kw", "50979", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("kw", "50976", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("kw", "7112", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("id", "992626", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("id", "99268", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
@@ -443,6 +450,7 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("mx", "30303025", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("mx", "3030302", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("mx", "3030303", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("mx", "81811", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("mw", "427611", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("mw", "4279", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
@@ -498,7 +506,8 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("pk", "90958", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("pk", "9092", SMS_CATEGORY_FREE_SHORT_CODE),
             new ShortCodeTest("pk", "909203", SMS_CATEGORY_FREE_SHORT_CODE),
-            new ShortCodeTest("pk", "909201", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("pk", "909219", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("pk", "909201", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("pl", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("pl", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -637,9 +646,11 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("uy", "191238", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("uy", "191289", SMS_CATEGORY_FREE_SHORT_CODE),
 
-            new ShortCodeTest("vn", "807982", SMS_CATEGORY_NOT_SHORT_CODE),
-            new ShortCodeTest("vn", "8078", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("vn", "8079", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("vn", "90002", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("vn", "1189892", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("vn", "118998", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("vn", "118989", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("ve", "5383526", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("ve", "538358", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),