Merge "Google RCS uses FTEU MO SMS for phone number verification Test Cases[ Week 06 and Week 07]" into android10-tests-dev

1 files changed, 37 insertions, 1 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 df8c6da59c9..1206552c189 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
@@ -79,6 +79,9 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("am", "101", SMS_CATEGORY_FREE_SHORT_CODE),
             new ShortCodeTest("am", "102", SMS_CATEGORY_FREE_SHORT_CODE),
             new ShortCodeTest("am", "103", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("am", "71522", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("am", "71512", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("am", "71502", SMS_CATEGORY_FREE_SHORT_CODE),
             new ShortCodeTest("am", "222", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("am", "1111", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("am", "9999", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
@@ -86,6 +89,8 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("am", "1141", SMS_CATEGORY_PREMIUM_SHORT_CODE),
             new ShortCodeTest("am", "1161", SMS_CATEGORY_PREMIUM_SHORT_CODE),
             new ShortCodeTest("am", "3024", SMS_CATEGORY_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("am", "715224", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("am", "71523", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
 
             new ShortCodeTest("at", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("at", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -215,6 +220,7 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("ec", "4664534", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("ec", "466499", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("ec", "466453", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("ec", "18512", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("ee", "112", expectedReturnCode("112")),
             new ShortCodeTest("ee", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -270,6 +276,15 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("ge", "8013", SMS_CATEGORY_PREMIUM_SHORT_CODE),
             new ShortCodeTest("ge", "8014", SMS_CATEGORY_PREMIUM_SHORT_CODE),
             new ShortCodeTest("ge", "8889", SMS_CATEGORY_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("ge", "95201", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("ge", "95202", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("ge", "95203", SMS_CATEGORY_FREE_SHORT_CODE),
+            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", "3775", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("gh", "3777", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("gr", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("gr", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -394,6 +409,12 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("ma", "53899", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("ma", "53819", SMS_CATEGORY_FREE_SHORT_CODE),
 
+            new ShortCodeTest("mn", "4444478", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("mn", "44445", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("mn", "44444", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("mn", "45678", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("mn", "445566", SMS_CATEGORY_FREE_SHORT_CODE),
+
             new ShortCodeTest("mx", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("mx", "2345", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("mx", "7766", SMS_CATEGORY_PREMIUM_SHORT_CODE),
@@ -452,9 +473,11 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("pe", "301307", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("pe", "301303", SMS_CATEGORY_FREE_SHORT_CODE),
 
-            new ShortCodeTest("pk", "909234", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("pk", "9092345", SMS_CATEGORY_NOT_SHORT_CODE),
             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("pl", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("pl", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -521,6 +544,7 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("sn", "212159", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("sn", "21299", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("sn", "21215", SMS_CATEGORY_FREE_SHORT_CODE),
+            new ShortCodeTest("sn", "21098", SMS_CATEGORY_FREE_SHORT_CODE),
 
             new ShortCodeTest("sk", "112", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("sk", "116117", SMS_CATEGORY_FREE_SHORT_CODE),
@@ -573,6 +597,18 @@ public class SmsUsageMonitorShortCodeTest {
             new ShortCodeTest("us", "968319", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("us", "96831", SMS_CATEGORY_FREE_SHORT_CODE),
 
+            new ShortCodeTest("uy", "550024", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("uy", "55003", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("uy", "55002", 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("za", "330092", SMS_CATEGORY_NOT_SHORT_CODE),
+            new ShortCodeTest("za", "33001", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
+            new ShortCodeTest("za", "33009", SMS_CATEGORY_FREE_SHORT_CODE),
+
             new ShortCodeTest("zw", "336791", SMS_CATEGORY_NOT_SHORT_CODE),
             new ShortCodeTest("zw", "33642", SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE),
             new ShortCodeTest("zw", "33679", SMS_CATEGORY_FREE_SHORT_CODE),