commit ca421a6c70c38ff00e4b98bc9d126aca415c6767
author Sarah Chin <sarahchin@google.com> Fri Jan 28 15:54:36 2022 -0800
committer Sarah Chin <sarahchin@google.com> Fri Jan 28 15:56:10 2022 -0800
tree 2e516c926cc976006adfd5872dae5f180f5d7fd1
parent 19b4005495c9a4ff71aeadcd5ab8c58807b17728

Final API changes for IRadio

Remove CarrierRestrictions#priority
Move USSD from messaging -> voice
Rename DataProfileInfo#TYPE_THREE_GPP/2 -> TYPE_3GPP2
Remove neighboring CID APIs

Test: atest VtsHalRadioTargetTest
Bug: 199433581
Bug: 216688606
Change-Id: I621d99b8024f92709bcb675b667bcba678eede9b

radio/aidl/vts/radio_messaging_test.cpp

diff --git a/radio/aidl/vts/radio_messaging_test.cpp b/radio/aidl/vts/radio_messaging_test.cpp
index 0abdfbc..9f1718b 100644
--- a/radio/aidl/vts/radio_messaging_test.cpp
+++ b/radio/aidl/vts/radio_messaging_test.cpp
@@ -418,7 +418,9 @@
     EXPECT_EQ(serial, radioRsp_messaging->rspInfo.serial);
 
     if (cardStatus.cardState == CardStatus::STATE_ABSENT) {
-        // TODO(shuoq): Will add error check when we know the expected error from QC
+        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_messaging->rspInfo.error,
+                                     {RadioError::INVALID_ARGUMENTS, RadioError::NO_SMS_TO_ACK},
+                                     CHECK_GENERAL_ERROR));
     }
     LOG(DEBUG) << "acknowledgeIncomingGsmSmsWithPdu finished";
 }
@@ -727,44 +729,3 @@
     }
     LOG(DEBUG) << "reportSmsMemoryStatus finished";
 }
-
-/*
- * Test IRadioMessaging.sendUssd() for the response returned.
- */
-TEST_P(RadioMessagingTest, sendUssd) {
-    LOG(DEBUG) << "sendUssd";
-    serial = GetRandomSerialNumber();
-    radio_messaging->sendUssd(serial, std::string("test"));
-    EXPECT_EQ(std::cv_status::no_timeout, wait());
-    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_messaging->rspInfo.type);
-    EXPECT_EQ(serial, radioRsp_messaging->rspInfo.serial);
-
-    if (cardStatus.cardState == CardStatus::STATE_ABSENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(
-                radioRsp_messaging->rspInfo.error,
-                {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR},
-                CHECK_GENERAL_ERROR));
-    }
-    LOG(DEBUG) << "sendUssd finished";
-}
-
-/*
- * Test IRadioMessaging.cancelPendingUssd() for the response returned.
- */
-TEST_P(RadioMessagingTest, cancelPendingUssd) {
-    LOG(DEBUG) << "cancelPendingUssd";
-    serial = GetRandomSerialNumber();
-
-    radio_messaging->cancelPendingUssd(serial);
-    EXPECT_EQ(std::cv_status::no_timeout, wait());
-    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_messaging->rspInfo.type);
-    EXPECT_EQ(serial, radioRsp_messaging->rspInfo.serial);
-
-    if (cardStatus.cardState == CardStatus::STATE_ABSENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(
-                radioRsp_messaging->rspInfo.error,
-                {RadioError::NONE, RadioError::INVALID_STATE, RadioError::MODEM_ERR},
-                CHECK_GENERAL_ERROR));
-    }
-    LOG(DEBUG) << "cancelPendingUssd finished";
-}