diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 7808de16ba..540397178b 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -27,7 +27,8 @@ cc_test { "radio_hidl_hal_test.cpp", "radio_hidl_hal_voice.cpp", "radio_response.cpp", - "VtsHalRadioV1_0TargetTest.cpp"], + "VtsHalRadioV1_0TargetTest.cpp", + "vts_test_util.cpp"], shared_libs: [ "libbase", "liblog", @@ -51,7 +52,8 @@ cc_test { srcs: ["sap_callback.cpp", "sap_hidl_hal_api.cpp", "sap_hidl_hal_test.cpp", - "VtsHalSapV1_0TargetTest.cpp"], + "VtsHalSapV1_0TargetTest.cpp", + "vts_test_util.cpp"], shared_libs: [ "libbase", "liblog", diff --git a/radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp b/radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp index e7c89d5b1e..59881eff7c 100644 --- a/radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp +++ b/radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp @@ -17,11 +17,16 @@ #include int main(int argc, char** argv) { - ::testing::AddGlobalTestEnvironment(new RadioHidlEnvironment); - ::testing::InitGoogleTest(&argc, argv); + ::testing::AddGlobalTestEnvironment(new RadioHidlEnvironment); + ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; + // setup seed for rand function + int seedSrand = time(NULL); + std::cout << "seed setup for random function (radio):" + std::to_string(seedSrand) << std::endl; + srand(seedSrand); - return status; + int status = RUN_ALL_TESTS(); + LOG(INFO) << "Test result = " << status; + + return status; } \ No newline at end of file diff --git a/radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp b/radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp index 53060765a0..5e5c50c7ad 100644 --- a/radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp +++ b/radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp @@ -17,12 +17,17 @@ #include int main(int argc, char** argv) { - // Add Sim-access Profile Hidl Environment - ::testing::AddGlobalTestEnvironment(new SapHidlEnvironment); - ::testing::InitGoogleTest(&argc, argv); + // Add Sim-access Profile Hidl Environment + ::testing::AddGlobalTestEnvironment(new SapHidlEnvironment); + ::testing::InitGoogleTest(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; + // setup seed for rand function + int seedSrand = time(NULL); + std::cout << "seed setup for random function (sap):" + std::to_string(seedSrand) << std::endl; + srand(seedSrand); - return status; + int status = RUN_ALL_TESTS(); + LOG(INFO) << "Test result = " << status; + + return status; } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp index bbca9e4062..3bf7c9d6a2 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp @@ -22,165 +22,163 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.setGsmBroadcastConfig() for the response returned. */ TEST_F(RadioHidlTest, setGsmBroadcastConfig) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Create GsmBroadcastSmsConfigInfo #1 - GsmBroadcastSmsConfigInfo gbSmsConfig1; - gbSmsConfig1.fromServiceId = 4352; - gbSmsConfig1.toServiceId = 4354; - gbSmsConfig1.fromCodeScheme = 0; - gbSmsConfig1.toCodeScheme = 255; - gbSmsConfig1.selected = true; + // Create GsmBroadcastSmsConfigInfo #1 + GsmBroadcastSmsConfigInfo gbSmsConfig1; + gbSmsConfig1.fromServiceId = 4352; + gbSmsConfig1.toServiceId = 4354; + gbSmsConfig1.fromCodeScheme = 0; + gbSmsConfig1.toCodeScheme = 255; + gbSmsConfig1.selected = true; - // Create GsmBroadcastSmsConfigInfo #2 - GsmBroadcastSmsConfigInfo gbSmsConfig2; - gbSmsConfig2.fromServiceId = 4356; - gbSmsConfig2.toServiceId = 4356; - gbSmsConfig2.fromCodeScheme = 0; - gbSmsConfig2.toCodeScheme = 255; - gbSmsConfig2.selected = true; + // Create GsmBroadcastSmsConfigInfo #2 + GsmBroadcastSmsConfigInfo gbSmsConfig2; + gbSmsConfig2.fromServiceId = 4356; + gbSmsConfig2.toServiceId = 4356; + gbSmsConfig2.fromCodeScheme = 0; + gbSmsConfig2.toCodeScheme = 255; + gbSmsConfig2.selected = true; - // Create GsmBroadcastSmsConfigInfo #3 - GsmBroadcastSmsConfigInfo gbSmsConfig3; - gbSmsConfig3.fromServiceId = 4370; - gbSmsConfig3.toServiceId = 4379; - gbSmsConfig3.fromCodeScheme = 0; - gbSmsConfig3.toCodeScheme = 255; - gbSmsConfig3.selected = true; + // Create GsmBroadcastSmsConfigInfo #3 + GsmBroadcastSmsConfigInfo gbSmsConfig3; + gbSmsConfig3.fromServiceId = 4370; + gbSmsConfig3.toServiceId = 4379; + gbSmsConfig3.fromCodeScheme = 0; + gbSmsConfig3.toCodeScheme = 255; + gbSmsConfig3.selected = true; - // Create GsmBroadcastSmsConfigInfo #4 - GsmBroadcastSmsConfigInfo gbSmsConfig4; - gbSmsConfig4.fromServiceId = 4383; - gbSmsConfig4.toServiceId = 4391; - gbSmsConfig4.fromCodeScheme = 0; - gbSmsConfig4.toCodeScheme = 255; - gbSmsConfig4.selected = true; + // Create GsmBroadcastSmsConfigInfo #4 + GsmBroadcastSmsConfigInfo gbSmsConfig4; + gbSmsConfig4.fromServiceId = 4383; + gbSmsConfig4.toServiceId = 4391; + gbSmsConfig4.fromCodeScheme = 0; + gbSmsConfig4.toCodeScheme = 255; + gbSmsConfig4.selected = true; - // Create GsmBroadcastSmsConfigInfo #5 - GsmBroadcastSmsConfigInfo gbSmsConfig5; - gbSmsConfig5.fromServiceId = 4392; - gbSmsConfig5.toServiceId = 4392; - gbSmsConfig5.fromCodeScheme = 0; - gbSmsConfig5.toCodeScheme = 255; - gbSmsConfig5.selected = true; + // Create GsmBroadcastSmsConfigInfo #5 + GsmBroadcastSmsConfigInfo gbSmsConfig5; + gbSmsConfig5.fromServiceId = 4392; + gbSmsConfig5.toServiceId = 4392; + gbSmsConfig5.fromCodeScheme = 0; + gbSmsConfig5.toCodeScheme = 255; + gbSmsConfig5.selected = true; - android::hardware::hidl_vec - gsmBroadcastSmsConfigsInfoList = { - gbSmsConfig1, gbSmsConfig2, gbSmsConfig3, gbSmsConfig4, gbSmsConfig5}; + android::hardware::hidl_vec gsmBroadcastSmsConfigsInfoList = { + gbSmsConfig1, gbSmsConfig2, gbSmsConfig3, gbSmsConfig4, gbSmsConfig5}; - radio->setGsmBroadcastConfig(++serial, gsmBroadcastSmsConfigsInfoList); + radio->setGsmBroadcastConfig(serial, gsmBroadcastSmsConfigsInfoList); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getGsmBroadcastConfig() for the response returned. */ TEST_F(RadioHidlTest, getGsmBroadcastConfig) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getGsmBroadcastConfig(++serial); + radio->getGsmBroadcastConfig(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setCdmaBroadcastConfig() for the response returned. */ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { - int serial = 0; + int serial = GetRandomSerialNumber(); - CdmaBroadcastSmsConfigInfo cbSmsConfig; - cbSmsConfig.serviceCategory = 4096; - cbSmsConfig.language = 1; - cbSmsConfig.selected = true; + CdmaBroadcastSmsConfigInfo cbSmsConfig; + cbSmsConfig.serviceCategory = 4096; + cbSmsConfig.language = 1; + cbSmsConfig.selected = true; - android::hardware::hidl_vec - cdmaBroadcastSmsConfigInfoList = {cbSmsConfig}; + android::hardware::hidl_vec cdmaBroadcastSmsConfigInfoList = { + cbSmsConfig}; - radio->setCdmaBroadcastConfig(++serial, cdmaBroadcastSmsConfigInfoList); + radio->setCdmaBroadcastConfig(serial, cdmaBroadcastSmsConfigInfoList); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + } } /* * Test IRadio.getCdmaBroadcastConfig() for the response returned. */ TEST_F(RadioHidlTest, getCdmaBroadcastConfig) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getCdmaBroadcastConfig(++serial); + radio->getCdmaBroadcastConfig(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError()); + } } /* * Test IRadio.setCdmaBroadcastActivation() for the response returned. */ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) { - int serial = 0; - bool activate = false; + int serial = GetRandomSerialNumber(); + bool activate = false; - radio->setCdmaBroadcastActivation(++serial, activate); + radio->setCdmaBroadcastActivation(serial, activate); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + } } /* * Test IRadio.setGsmBroadcastActivation() for the response returned. */ TEST_F(RadioHidlTest, setGsmBroadcastActivation) { - int serial = 0; - bool activate = false; + int serial = GetRandomSerialNumber(); + bool activate = false; - radio->setGsmBroadcastActivation(++serial, activate); + radio->setGsmBroadcastActivation(serial, activate); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp index 4eeabe8406..108676b9d4 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp @@ -22,209 +22,204 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.getDataRegistrationState() for the response returned. */ TEST_F(RadioHidlTest, getDataRegistrationState) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getDataRegistrationState(++serial); + radio->getDataRegistrationState(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.setupDataCall() for the response returned. */ TEST_F(RadioHidlTest, setupDataCall) { - int serial = 0; + int serial = GetRandomSerialNumber(); - RadioTechnology radioTechnology = RadioTechnology::LTE; + RadioTechnology radioTechnology = RadioTechnology::LTE; - DataProfileInfo dataProfileInfo; - memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); - dataProfileInfo.profileId = DataProfileId::IMS; - dataProfileInfo.apn = hidl_string("VZWIMS"); - dataProfileInfo.protocol = hidl_string("IPV4V6"); - dataProfileInfo.roamingProtocol = hidl_string("IPV6"); - dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; - dataProfileInfo.user = ""; - dataProfileInfo.password = ""; - dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; - dataProfileInfo.maxConnsTime = 300; - dataProfileInfo.maxConns = 20; - dataProfileInfo.waitTime = 0; - dataProfileInfo.enabled = true; - dataProfileInfo.supportedApnTypesBitmap = 320; - dataProfileInfo.bearerBitmap = 161543; - dataProfileInfo.mtu = 0; - dataProfileInfo.mvnoType = MvnoType::NONE; - dataProfileInfo.mvnoMatchData = hidl_string(); + DataProfileInfo dataProfileInfo; + memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); + dataProfileInfo.profileId = DataProfileId::IMS; + dataProfileInfo.apn = hidl_string("VZWIMS"); + dataProfileInfo.protocol = hidl_string("IPV4V6"); + dataProfileInfo.roamingProtocol = hidl_string("IPV6"); + dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; + dataProfileInfo.user = ""; + dataProfileInfo.password = ""; + dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; + dataProfileInfo.maxConnsTime = 300; + dataProfileInfo.maxConns = 20; + dataProfileInfo.waitTime = 0; + dataProfileInfo.enabled = true; + dataProfileInfo.supportedApnTypesBitmap = 320; + dataProfileInfo.bearerBitmap = 161543; + dataProfileInfo.mtu = 0; + dataProfileInfo.mvnoType = MvnoType::NONE; + dataProfileInfo.mvnoMatchData = hidl_string(); - bool modemCognitive = false; - bool roamingAllowed = false; - bool isRoaming = false; + bool modemCognitive = false; + bool roamingAllowed = false; + bool isRoaming = false; - radio->setupDataCall(++serial, radioTechnology, dataProfileInfo, - modemCognitive, roamingAllowed, isRoaming); + radio->setupDataCall(serial, radioTechnology, dataProfileInfo, modemCognitive, roamingAllowed, + isRoaming); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - radioRsp->rspInfo.error == - RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW || - radioRsp->rspInfo.error == - RadioError::OP_NOT_ALLOWED_DURING_VOICE_CALL || - CheckOEMError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || + radioRsp->rspInfo.error == RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW || + radioRsp->rspInfo.error == RadioError::OP_NOT_ALLOWED_DURING_VOICE_CALL || + CheckOEMError()); + } } /* * Test IRadio.deactivateDataCall() for the response returned. */ TEST_F(RadioHidlTest, deactivateDataCall) { - int serial = 0; - int cid = 1; - bool reasonRadioShutDown = false; + int serial = GetRandomSerialNumber(); + int cid = 1; + bool reasonRadioShutDown = false; - radio->deactivateDataCall(++serial, cid, reasonRadioShutDown); + radio->deactivateDataCall(serial, cid, reasonRadioShutDown); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error); + } } /* * Test IRadio.getDataCallList() for the response returned. */ TEST_F(RadioHidlTest, getDataCallList) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getDataCallList(++serial); + radio->getDataCallList(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); + } } /* * Test IRadio.setInitialAttachApn() for the response returned. */ TEST_F(RadioHidlTest, setInitialAttachApn) { - int serial = 0; + int serial = GetRandomSerialNumber(); - DataProfileInfo dataProfileInfo; - memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); - dataProfileInfo.profileId = DataProfileId::IMS; - dataProfileInfo.apn = hidl_string("VZWIMS"); - dataProfileInfo.protocol = hidl_string("IPV4V6"); - dataProfileInfo.roamingProtocol = hidl_string("IPV6"); - dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; - dataProfileInfo.user = ""; - dataProfileInfo.password = ""; - dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; - dataProfileInfo.maxConnsTime = 300; - dataProfileInfo.maxConns = 20; - dataProfileInfo.waitTime = 0; - dataProfileInfo.enabled = true; - dataProfileInfo.supportedApnTypesBitmap = 320; - dataProfileInfo.bearerBitmap = 161543; - dataProfileInfo.mtu = 0; - dataProfileInfo.mvnoType = MvnoType::NONE; - dataProfileInfo.mvnoMatchData = hidl_string(); + DataProfileInfo dataProfileInfo; + memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); + dataProfileInfo.profileId = DataProfileId::IMS; + dataProfileInfo.apn = hidl_string("VZWIMS"); + dataProfileInfo.protocol = hidl_string("IPV4V6"); + dataProfileInfo.roamingProtocol = hidl_string("IPV6"); + dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; + dataProfileInfo.user = ""; + dataProfileInfo.password = ""; + dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; + dataProfileInfo.maxConnsTime = 300; + dataProfileInfo.maxConns = 20; + dataProfileInfo.waitTime = 0; + dataProfileInfo.enabled = true; + dataProfileInfo.supportedApnTypesBitmap = 320; + dataProfileInfo.bearerBitmap = 161543; + dataProfileInfo.mtu = 0; + dataProfileInfo.mvnoType = MvnoType::NONE; + dataProfileInfo.mvnoMatchData = hidl_string(); - bool modemCognitive = true; - bool isRoaming = false; + bool modemCognitive = true; + bool isRoaming = false; - radio->setInitialAttachApn(++serial, dataProfileInfo, modemCognitive, - isRoaming); + radio->setInitialAttachApn(serial, dataProfileInfo, modemCognitive, isRoaming); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - radioRsp->rspInfo.error == - RadioError::SUBSCRIPTION_NOT_AVAILABLE || - CheckOEMError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || + radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE || + CheckOEMError()); + } } /* * Test IRadio.setDataAllowed() for the response returned. */ TEST_F(RadioHidlTest, setDataAllowed) { - int serial = 0; - bool allow = true; + int serial = GetRandomSerialNumber(); + bool allow = true; - radio->setDataAllowed(++serial, allow); + radio->setDataAllowed(serial, allow); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.setDataProfile() for the response returned. */ TEST_F(RadioHidlTest, setDataProfile) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Create a dataProfileInfo - DataProfileInfo dataProfileInfo; - memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); - dataProfileInfo.profileId = DataProfileId::IMS; - dataProfileInfo.apn = hidl_string("VZWIMS"); - dataProfileInfo.protocol = hidl_string("IPV4V6"); - dataProfileInfo.roamingProtocol = hidl_string("IPV6"); - dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; - dataProfileInfo.user = ""; - dataProfileInfo.password = ""; - dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; - dataProfileInfo.maxConnsTime = 300; - dataProfileInfo.maxConns = 20; - dataProfileInfo.waitTime = 0; - dataProfileInfo.enabled = true; - dataProfileInfo.supportedApnTypesBitmap = 320; - dataProfileInfo.bearerBitmap = 161543; - dataProfileInfo.mtu = 0; - dataProfileInfo.mvnoType = MvnoType::NONE; - dataProfileInfo.mvnoMatchData = hidl_string(); + // Create a dataProfileInfo + DataProfileInfo dataProfileInfo; + memset(&dataProfileInfo, 0, sizeof(dataProfileInfo)); + dataProfileInfo.profileId = DataProfileId::IMS; + dataProfileInfo.apn = hidl_string("VZWIMS"); + dataProfileInfo.protocol = hidl_string("IPV4V6"); + dataProfileInfo.roamingProtocol = hidl_string("IPV6"); + dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP; + dataProfileInfo.user = ""; + dataProfileInfo.password = ""; + dataProfileInfo.type = DataProfileInfoType::THREE_GPP2; + dataProfileInfo.maxConnsTime = 300; + dataProfileInfo.maxConns = 20; + dataProfileInfo.waitTime = 0; + dataProfileInfo.enabled = true; + dataProfileInfo.supportedApnTypesBitmap = 320; + dataProfileInfo.bearerBitmap = 161543; + dataProfileInfo.mtu = 0; + dataProfileInfo.mvnoType = MvnoType::NONE; + dataProfileInfo.mvnoMatchData = hidl_string(); - // Create a dataProfileInfoList - android::hardware::hidl_vec dataProfileInfoList = { - dataProfileInfo}; + // Create a dataProfileInfoList + android::hardware::hidl_vec dataProfileInfoList = {dataProfileInfo}; - bool isRoadming = false; + bool isRoadming = false; - radio->setDataProfile(++serial, dataProfileInfoList, isRoadming); + radio->setDataProfile(serial, dataProfileInfoList, isRoadming); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - // TODO(shuoq): Will add error check when we know the expected error from QC - } + if (cardStatus.cardState == CardState::ABSENT) { + // TODO(shuoq): Will add error check when we know the expected error from QC + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp index 1547c33b07..a8857c3455 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -20,304 +20,303 @@ * Test IRadio.getIccCardStatus() for the response returned. */ TEST_F(RadioHidlTest, getIccCardStatus) { - EXPECT_LE(cardStatus.applications.size(), - (unsigned int)RadioConst::CARD_MAX_APPS); - EXPECT_LT(cardStatus.gsmUmtsSubscriptionAppIndex, - (int)RadioConst::CARD_MAX_APPS); - EXPECT_LT(cardStatus.cdmaSubscriptionAppIndex, - (int)RadioConst::CARD_MAX_APPS); - EXPECT_LT(cardStatus.imsSubscriptionAppIndex, (int)RadioConst::CARD_MAX_APPS); + EXPECT_LE(cardStatus.applications.size(), (unsigned int)RadioConst::CARD_MAX_APPS); + EXPECT_LT(cardStatus.gsmUmtsSubscriptionAppIndex, (int)RadioConst::CARD_MAX_APPS); + EXPECT_LT(cardStatus.cdmaSubscriptionAppIndex, (int)RadioConst::CARD_MAX_APPS); + EXPECT_LT(cardStatus.imsSubscriptionAppIndex, (int)RadioConst::CARD_MAX_APPS); } /* * Test IRadio.supplyIccPinForApp() for the response returned */ TEST_F(RadioHidlTest, supplyIccPinForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->supplyIccPinForApp(++serial, hidl_string("test1"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->supplyIccPinForApp(serial, hidl_string("test1"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.supplyIccPukForApp() for the response returned. */ TEST_F(RadioHidlTest, supplyIccPukForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->supplyIccPukForApp(++serial, hidl_string("test1"), - hidl_string("test2"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->supplyIccPukForApp(serial, hidl_string("test1"), hidl_string("test2"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.supplyIccPin2ForApp() for the response returned. */ TEST_F(RadioHidlTest, supplyIccPin2ForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->supplyIccPin2ForApp(++serial, hidl_string("test1"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->supplyIccPin2ForApp(serial, hidl_string("test1"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.supplyIccPuk2ForApp() for the response returned. */ TEST_F(RadioHidlTest, supplyIccPuk2ForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->supplyIccPuk2ForApp(++serial, hidl_string("test1"), - hidl_string("test2"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->supplyIccPuk2ForApp(serial, hidl_string("test1"), hidl_string("test2"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.changeIccPinForApp() for the response returned. */ TEST_F(RadioHidlTest, changeIccPinForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->changeIccPinForApp(++serial, hidl_string("test1"), - hidl_string("test2"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->changeIccPinForApp(serial, hidl_string("test1"), hidl_string("test2"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.changeIccPin2ForApp() for the response returned. */ TEST_F(RadioHidlTest, changeIccPin2ForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and - // 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->changeIccPin2ForApp(++serial, hidl_string("test1"), - hidl_string("test2"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and + // 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->changeIccPin2ForApp(serial, hidl_string("test1"), hidl_string("test2"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error); + } } - } } /* * Test IRadio.getImsiForApp() for the response returned. */ TEST_F(RadioHidlTest, getImsiForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Check success returned while getting imsi for 3GPP and 3GPP2 apps only - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - if (cardStatus.applications[i].appType == AppType::SIM || - cardStatus.applications[i].appType == AppType::USIM || - cardStatus.applications[i].appType == AppType::RUIM || - cardStatus.applications[i].appType == AppType::CSIM) { - radio->getImsiForApp(++serial, cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + // Check success returned while getting imsi for 3GPP and 3GPP2 apps only + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + if (cardStatus.applications[i].appType == AppType::SIM || + cardStatus.applications[i].appType == AppType::USIM || + cardStatus.applications[i].appType == AppType::RUIM || + cardStatus.applications[i].appType == AppType::CSIM) { + radio->getImsiForApp(serial, cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - // IMSI (MCC+MNC+MSIN) is at least 6 digits, but not more than 15 - if (radioRsp->rspInfo.error == RadioError::NONE) { - EXPECT_NE(radioRsp->imsi, hidl_string()); - EXPECT_GE((int)(radioRsp->imsi).size(), 6); - EXPECT_LE((int)(radioRsp->imsi).size(), 15); - } + // IMSI (MCC+MNC+MSIN) is at least 6 digits, but not more than 15 + if (radioRsp->rspInfo.error == RadioError::NONE) { + EXPECT_NE(radioRsp->imsi, hidl_string()); + EXPECT_GE((int)(radioRsp->imsi).size(), 6); + EXPECT_LE((int)(radioRsp->imsi).size(), 15); + } + } } - } } /* * Test IRadio.iccIOForApp() for the response returned. */ TEST_F(RadioHidlTest, iccIOForApp) { - int serial = 1; + int serial = GetRandomSerialNumber(); - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - IccIo iccIo; - iccIo.command = 0xc0; - iccIo.fileId = 0x6f11; - iccIo.path = hidl_string("3F007FFF"); - iccIo.p1 = 0; - iccIo.p2 = 0; - iccIo.p3 = 0; - iccIo.data = hidl_string(); - iccIo.pin2 = hidl_string(); - iccIo.aid = cardStatus.applications[i].aidPtr; + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + IccIo iccIo; + iccIo.command = 0xc0; + iccIo.fileId = 0x6f11; + iccIo.path = hidl_string("3F007FFF"); + iccIo.p1 = 0; + iccIo.p2 = 0; + iccIo.p3 = 0; + iccIo.data = hidl_string(); + iccIo.pin2 = hidl_string(); + iccIo.aid = cardStatus.applications[i].aidPtr; - radio->iccIOForApp(++serial, iccIo); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - } + radio->iccIOForApp(serial, iccIo); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + } } /* * Test IRadio.iccTransmitApduBasicChannel() for the response returned. */ TEST_F(RadioHidlTest, iccTransmitApduBasicChannel) { - int serial = 1; - SimApdu msg; - memset(&msg, 0, sizeof(msg)); - msg.data = hidl_string(); + int serial = GetRandomSerialNumber(); + SimApdu msg; + memset(&msg, 0, sizeof(msg)); + msg.data = hidl_string(); - radio->iccTransmitApduBasicChannel(serial, msg); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->iccTransmitApduBasicChannel(serial, msg); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - // TODO(sanketpadawe): Add test for error code + // TODO(sanketpadawe): Add test for error code } /* * Test IRadio.iccOpenLogicalChannel() for the response returned. */ TEST_F(RadioHidlTest, iccOpenLogicalChannel) { - int serial = 1; - int p2 = 0x04; - // Specified in ISO 7816-4 clause 7.1.1 0x04 means that FCP template is requested. - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - radio->iccOpenLogicalChannel(++serial, cardStatus.applications[i].aidPtr, p2); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - } + int serial = GetRandomSerialNumber(); + int p2 = 0x04; + // Specified in ISO 7816-4 clause 7.1.1 0x04 means that FCP template is requested. + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + radio->iccOpenLogicalChannel(serial, cardStatus.applications[i].aidPtr, p2); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + } } /* * Test IRadio.iccCloseLogicalChannel() for the response returned. */ TEST_F(RadioHidlTest, iccCloseLogicalChannel) { - int serial = 1; - // Try closing invalid channel and check INVALID_ARGUMENTS returned as error - radio->iccCloseLogicalChannel(serial, 0); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + int serial = GetRandomSerialNumber(); + // Try closing invalid channel and check INVALID_ARGUMENTS returned as error + radio->iccCloseLogicalChannel(serial, 0); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); + EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); } /* * Test IRadio.iccTransmitApduLogicalChannel() for the response returned. */ TEST_F(RadioHidlTest, iccTransmitApduLogicalChannel) { - SimApdu msg; - memset(&msg, 0, sizeof(msg)); - msg.data = hidl_string(); + int serial = GetRandomSerialNumber(); + SimApdu msg; + memset(&msg, 0, sizeof(msg)); + msg.data = hidl_string(); - radio->iccTransmitApduLogicalChannel(1, msg); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(1, radioRsp->rspInfo.serial); + radio->iccTransmitApduLogicalChannel(serial, msg); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - // TODO(sanketpadawe): Add test for error code + // TODO(sanketpadawe): Add test for error code } /* * Test IRadio.requestIccSimAuthentication() for the response returned. */ TEST_F(RadioHidlTest, requestIccSimAuthentication) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Pass wrong challenge string and check RadioError::INVALID_ARGUMENTS - // returned as error. - for (int i = 0; i < (int)cardStatus.applications.size(); i++) { - radio->requestIccSimAuthentication(++serial, 0, hidl_string("test"), - cardStatus.applications[i].aidPtr); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); - } + // Pass wrong challenge string and check RadioError::INVALID_ARGUMENTS + // returned as error. + for (int i = 0; i < (int)cardStatus.applications.size(); i++) { + radio->requestIccSimAuthentication(serial, 0, hidl_string("test"), + cardStatus.applications[i].aidPtr); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); + } } /* * Test IRadio.supplyNetworkDepersonalization() for the response returned. */ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->supplyNetworkDepersonalization(serial, hidl_string("test")); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->supplyNetworkDepersonalization(serial, hidl_string("test")); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || + radioRsp->rspInfo.error == RadioError::NO_MEMORY || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_SIM_STATE || + radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT || + radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp index ddf6b7eec8..ec99d428c5 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp @@ -22,178 +22,174 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.getClir() for the response returned. */ TEST_F(RadioHidlTest, getClir) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getClir(++serial); + radio->getClir(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setClir() for the response returned. */ TEST_F(RadioHidlTest, setClir) { - int serial = 0; - int32_t status = 1; + int serial = GetRandomSerialNumber(); + int32_t status = 1; - radio->setClir(++serial, status); + radio->setClir(serial, status); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.getFacilityLockForApp() for the response returned. */ TEST_F(RadioHidlTest, getFacilityLockForApp) { - int serial = 0; - std::string facility = ""; - std::string password = ""; - int32_t serviceClass = 1; - std::string appId = ""; + int serial = GetRandomSerialNumber(); + std::string facility = ""; + std::string password = ""; + int32_t serviceClass = 1; + std::string appId = ""; - radio->getFacilityLockForApp(++serial, facility, password, serviceClass, - appId); + radio->getFacilityLockForApp(serial, facility, password, serviceClass, appId); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setFacilityLockForApp() for the response returned. */ TEST_F(RadioHidlTest, setFacilityLockForApp) { - int serial = 0; - std::string facility = ""; - bool lockState = false; - std::string password = ""; - int32_t serviceClass = 1; - std::string appId = ""; + int serial = GetRandomSerialNumber(); + std::string facility = ""; + bool lockState = false; + std::string password = ""; + int32_t serviceClass = 1; + std::string appId = ""; - radio->setFacilityLockForApp(++serial, facility, lockState, password, - serviceClass, appId); + radio->setFacilityLockForApp(serial, facility, lockState, password, serviceClass, appId); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setBarringPassword() for the response returned. */ TEST_F(RadioHidlTest, setBarringPassword) { - int serial = 0; - std::string facility = ""; - std::string oldPassword = ""; - std::string newPassword = ""; + int serial = GetRandomSerialNumber(); + std::string facility = ""; + std::string oldPassword = ""; + std::string newPassword = ""; - radio->setBarringPassword(++serial, facility, oldPassword, newPassword); + radio->setBarringPassword(serial, facility, oldPassword, newPassword); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE); + } } /* * Test IRadio.getClip() for the response returned. */ TEST_F(RadioHidlTest, getClip) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getClip(++serial); + radio->getClip(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setSuppServiceNotifications() for the response returned. */ TEST_F(RadioHidlTest, setSuppServiceNotifications) { - int serial = 0; - bool enable = false; + int serial = GetRandomSerialNumber(); + bool enable = false; - radio->setSuppServiceNotifications(++serial, enable); + radio->setSuppServiceNotifications(serial, enable); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.requestIsimAuthentication() for the response returned. */ TEST_F(RadioHidlTest, requestIsimAuthentication) { - int serial = 0; - std::string challenge = ""; + int serial = GetRandomSerialNumber(); + std::string challenge = ""; - radio->requestIsimAuthentication(++serial, challenge); + radio->requestIsimAuthentication(serial, challenge); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError()); + } } /* * Test IRadio.getImsRegistrationState() for the response returned. */ TEST_F(RadioHidlTest, getImsRegistrationState) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getImsRegistrationState(++serial); + radio->getImsRegistrationState(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index 6879c90fc3..29cb91232f 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -20,800 +20,809 @@ * Test IRadio.getSignalStrength() for the response returned. */ TEST_F(RadioHidlTest, getSignalStrength) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getSignalStrength(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getSignalStrength(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getVoiceRegistrationState() for the response returned. */ TEST_F(RadioHidlTest, getVoiceRegistrationState) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getVoiceRegistrationState(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getVoiceRegistrationState(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getOperator() for the response returned. */ TEST_F(RadioHidlTest, getOperator) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getOperator(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getOperator(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setRadioPower() for the response returned. */ TEST_F(RadioHidlTest, setRadioPower) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setRadioPower(++serial, 0); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setRadioPower(serial, 0); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getNetworkSelectionMode() for the response returned. */ TEST_F(RadioHidlTest, getNetworkSelectionMode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getNetworkSelectionMode(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getNetworkSelectionMode(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setNetworkSelectionModeAutomatic() for the response returned. */ TEST_F(RadioHidlTest, setNetworkSelectionModeAutomatic) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setNetworkSelectionModeAutomatic(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setNetworkSelectionModeAutomatic(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + } } /* * Test IRadio.setNetworkSelectionModeManual() for the response returned. */ TEST_F(RadioHidlTest, setNetworkSelectionModeManual) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setNetworkSelectionModeManual(++serial, "123456"); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setNetworkSelectionModeManual(serial, "123456"); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::ILLEGAL_SIM_OR_ME || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + } } /* * Test IRadio.getAvailableNetworks() for the response returned. */ TEST_F(RadioHidlTest, getAvailableNetworks) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getAvailableNetworks(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getAvailableNetworks(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + ASSERT_TRUE(radioRsp->rspInfo.type == RadioResponseType::SOLICITED || + radioRsp->rspInfo.type == RadioResponseType::SOLICITED_ACK_EXP); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || - radioRsp->rspInfo.error == RadioError::CANCELLED || - radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || + radioRsp->rspInfo.error == RadioError::CANCELLED || + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getBasebandVersion() for the response returned. */ TEST_F(RadioHidlTest, getBasebandVersion) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getBasebandVersion(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getBasebandVersion(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setBandMode() for the response returned. */ TEST_F(RadioHidlTest, setBandMode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setBandMode(++serial, RadioBandMode::BAND_MODE_USA); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setBandMode(serial, RadioBandMode::BAND_MODE_USA); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getAvailableBandModes() for the response returned. */ TEST_F(RadioHidlTest, getAvailableBandModes) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getAvailableBandModes(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getAvailableBandModes(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setPreferredNetworkType() for the response returned. */ TEST_F(RadioHidlTest, setPreferredNetworkType) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setPreferredNetworkType(++serial, PreferredNetworkType::GSM_ONLY); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setPreferredNetworkType(serial, PreferredNetworkType::GSM_ONLY); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getPreferredNetworkType() for the response returned. */ TEST_F(RadioHidlTest, getPreferredNetworkType) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getPreferredNetworkType(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getPreferredNetworkType(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getNeighboringCids() for the response returned. */ TEST_F(RadioHidlTest, getNeighboringCids) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getNeighboringCids(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getNeighboringCids(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setLocationUpdates() for the response returned. */ TEST_F(RadioHidlTest, setLocationUpdates) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setLocationUpdates(++serial, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setLocationUpdates(serial, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setCdmaRoamingPreference() for the response returned. */ TEST_F(RadioHidlTest, setCdmaRoamingPreference) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setCdmaRoamingPreference(++serial, CdmaRoamingType::HOME_NETWORK); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setCdmaRoamingPreference(serial, CdmaRoamingType::HOME_NETWORK); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getCdmaRoamingPreference() for the response returned. */ TEST_F(RadioHidlTest, getCdmaRoamingPreference) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCdmaRoamingPreference(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCdmaRoamingPreference(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getTTYMode() for the response returned. */ TEST_F(RadioHidlTest, getTTYMode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getTTYMode(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getTTYMode(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setTTYMode() for the response returned. */ TEST_F(RadioHidlTest, setTTYMode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setTTYMode(++serial, TtyMode::OFF); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setTTYMode(serial, TtyMode::OFF); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setPreferredVoicePrivacy() for the response returned. */ TEST_F(RadioHidlTest, setPreferredVoicePrivacy) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setPreferredVoicePrivacy(++serial, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setPreferredVoicePrivacy(serial, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getPreferredVoicePrivacy() for the response returned. */ TEST_F(RadioHidlTest, getPreferredVoicePrivacy) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getPreferredVoicePrivacy(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getPreferredVoicePrivacy(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getCDMASubscription() for the response returned. */ TEST_F(RadioHidlTest, getCDMASubscription) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCDMASubscription(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCDMASubscription(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getDeviceIdentity() for the response returned. */ TEST_F(RadioHidlTest, getDeviceIdentity) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getDeviceIdentity(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getDeviceIdentity(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.exitEmergencyCallbackMode() for the response returned. */ TEST_F(RadioHidlTest, exitEmergencyCallbackMode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->exitEmergencyCallbackMode(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->exitEmergencyCallbackMode(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getCdmaSubscriptionSource() for the response returned. */ TEST_F(RadioHidlTest, getCdmaSubscriptionSource) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCdmaSubscriptionSource(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCdmaSubscriptionSource(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setCdmaSubscriptionSource() for the response returned. */ TEST_F(RadioHidlTest, setCdmaSubscriptionSource) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setCdmaSubscriptionSource(++serial, CdmaSubscriptionSource::RUIM_SIM); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setCdmaSubscriptionSource(serial, CdmaSubscriptionSource::RUIM_SIM); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp->rspInfo.error == - RadioError::SUBSCRIPTION_NOT_AVAILABLE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT || + radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE); + } } /* * Test IRadio.getVoiceRadioTechnology() for the response returned. */ TEST_F(RadioHidlTest, getVoiceRadioTechnology) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getVoiceRadioTechnology(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getVoiceRadioTechnology(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getCellInfoList() for the response returned. */ TEST_F(RadioHidlTest, getCellInfoList) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCellInfoList(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCellInfoList(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND); + } } /* * Test IRadio.setCellInfoListRate() for the response returned. */ TEST_F(RadioHidlTest, setCellInfoListRate) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // TODO(sanketpadawe): RIL crashes with value of rate = 10 - radio->setCellInfoListRate(++serial, 10); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + // TODO(sanketpadawe): RIL crashes with value of rate = 10 + radio->setCellInfoListRate(serial, 10); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.nvReadItem() for the response returned. */ TEST_F(RadioHidlTest, nvReadItem) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->nvReadItem(++serial, NvItem::LTE_BAND_ENABLE_25); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->nvReadItem(serial, NvItem::LTE_BAND_ENABLE_25); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.nvWriteItem() for the response returned. */ TEST_F(RadioHidlTest, nvWriteItem) { - int serial = 1; - NvWriteItem item; - memset(&item, 0, sizeof(item)); - item.value = hidl_string(); + int serial = GetRandomSerialNumber(); + NvWriteItem item; + memset(&item, 0, sizeof(item)); + item.value = hidl_string(); - radio->nvWriteItem(++serial, item); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->nvWriteItem(serial, item); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.nvWriteCdmaPrl() for the response returned. */ TEST_F(RadioHidlTest, nvWriteCdmaPrl) { - int serial = 1; - std::vector prl = {1, 2, 3, 4, 5}; + int serial = GetRandomSerialNumber(); + std::vector prl = {1, 2, 3, 4, 5}; - radio->nvWriteCdmaPrl(++serial, hidl_vec(prl)); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->nvWriteCdmaPrl(serial, hidl_vec(prl)); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.nvResetConfig() for the response returned. */ TEST_F(RadioHidlTest, nvResetConfig) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->nvResetConfig(++serial, ResetNvType::RELOAD); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->nvResetConfig(++serial, ResetNvType::ERASE); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setUiccSubscription() for the response returned. */ TEST_F(RadioHidlTest, setUiccSubscription) { - int serial = 1; - SelectUiccSub item; - memset(&item, 0, sizeof(item)); + int serial = GetRandomSerialNumber(); + SelectUiccSub item; + memset(&item, 0, sizeof(item)); - radio->setUiccSubscription(++serial, item); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setUiccSubscription(serial, item); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == - RadioError::SUBSCRIPTION_NOT_SUPPORTED || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getHardwareConfig() for the response returned. */ TEST_F(RadioHidlTest, getHardwareConfig) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getHardwareConfig(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getHardwareConfig(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.requestShutdown() for the response returned. */ TEST_F(RadioHidlTest, requestShutdown) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->requestShutdown(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->requestShutdown(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getRadioCapability() for the response returned. */ TEST_F(RadioHidlTest, getRadioCapability) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getRadioCapability(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getRadioCapability(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setRadioCapability() for the response returned. */ TEST_F(RadioHidlTest, setRadioCapability) { - int serial = 1; - RadioCapability rc; - memset(&rc, 0, sizeof(rc)); - rc.logicalModemUuid = hidl_string(); + int serial = GetRandomSerialNumber(); + RadioCapability rc; + memset(&rc, 0, sizeof(rc)); + rc.logicalModemUuid = hidl_string(); - radio->setRadioCapability(++serial, rc); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setRadioCapability(serial, rc); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + } } /* * Test IRadio.startLceService() for the response returned. */ TEST_F(RadioHidlTest, startLceService) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->startLceService(++serial, 5, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->startLceService(serial, 5, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED || - radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || + radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); + } } /* * Test IRadio.stopLceService() for the response returned. */ TEST_F(RadioHidlTest, stopLceService) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->stopLceService(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->stopLceService(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED); + } } /* * Test IRadio.pullLceData() for the response returned. */ TEST_F(RadioHidlTest, pullLceData) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->pullLceData(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->pullLceData(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - CheckOEMError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError()); + } } /* * Test IRadio.getModemActivityInfo() for the response returned. */ TEST_F(RadioHidlTest, getModemActivityInfo) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getModemActivityInfo(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getModemActivityInfo(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.setAllowedCarriers() for the response returned. */ TEST_F(RadioHidlTest, setAllowedCarriers) { - int serial = 1; - CarrierRestrictions carriers; - memset(&carriers, 0, sizeof(carriers)); - carriers.allowedCarriers.resize(1); - carriers.excludedCarriers.resize(0); - carriers.allowedCarriers[0].mcc = hidl_string(); - carriers.allowedCarriers[0].mnc = hidl_string(); - carriers.allowedCarriers[0].matchType = CarrierMatchType::ALL; - carriers.allowedCarriers[0].matchData = hidl_string(); + int serial = GetRandomSerialNumber(); + CarrierRestrictions carriers; + memset(&carriers, 0, sizeof(carriers)); + carriers.allowedCarriers.resize(1); + carriers.excludedCarriers.resize(0); + carriers.allowedCarriers[0].mcc = hidl_string(); + carriers.allowedCarriers[0].mnc = hidl_string(); + carriers.allowedCarriers[0].matchType = CarrierMatchType::ALL; + carriers.allowedCarriers[0].matchData = hidl_string(); - radio->setAllowedCarriers(++serial, false, carriers); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setAllowedCarriers(serial, false, carriers); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } + + /* Reset back to no carrier restriction */ + memset(&carriers, 0, sizeof(carriers)); + carriers.allowedCarriers.resize(0); + carriers.excludedCarriers.resize(0); + + radio->setAllowedCarriers(++serial, true, carriers); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getAllowedCarriers() for the response returned. */ TEST_F(RadioHidlTest, getAllowedCarriers) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getAllowedCarriers(++serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getAllowedCarriers(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.sendDeviceState() for the response returned. */ TEST_F(RadioHidlTest, sendDeviceState) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->sendDeviceState(++serial, DeviceStateType::POWER_SAVE_MODE, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->sendDeviceState(serial, DeviceStateType::POWER_SAVE_MODE, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + } } /* * Test IRadio.setIndicationFilter() for the response returned. */ TEST_F(RadioHidlTest, setIndicationFilter) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setIndicationFilter(++serial, 1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setIndicationFilter(serial, 1); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + } } /* * Test IRadio.setSimCardPower() for the response returned. */ TEST_F(RadioHidlTest, setSimCardPower) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setSimCardPower(++serial, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setSimCardPower(serial, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + } } \ No newline at end of file diff --git a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp index b8a50c0c70..698cf26df5 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp @@ -22,417 +22,412 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.sendSms() for the response returned. */ TEST_F(RadioHidlTest, sendSms) { - int serial = 0; - GsmSmsMessage msg; - msg.smscPdu = ""; - msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; + int serial = GetRandomSerialNumber(); + GsmSmsMessage msg; + msg.smscPdu = ""; + msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; - radio->sendSms(++serial, msg); + radio->sendSms(serial, msg); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); + } } /* * Test IRadio.sendSMSExpectMore() for the response returned. */ TEST_F(RadioHidlTest, sendSMSExpectMore) { - int serial = 0; - GsmSmsMessage msg; - msg.smscPdu = ""; - msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; + int serial = GetRandomSerialNumber(); + GsmSmsMessage msg; + msg.smscPdu = ""; + msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; - radio->sendSMSExpectMore(++serial, msg); + radio->sendSMSExpectMore(serial, msg); - // TODO(shuoq): add more test for this API when inserted sim card is - // considered + // TODO(shuoq): add more test for this API when inserted sim card is + // considered - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + } } /* * Test IRadio.acknowledgeLastIncomingGsmSms() for the response returned. */ TEST_F(RadioHidlTest, acknowledgeLastIncomingGsmSms) { - int serial = 0; - bool success = true; + int serial = GetRandomSerialNumber(); + bool success = true; - radio->acknowledgeLastIncomingGsmSms( - ++serial, success, SmsAcknowledgeFailCause::MEMORY_CAPACITY_EXCEEDED); + radio->acknowledgeLastIncomingGsmSms(serial, success, + SmsAcknowledgeFailCause::MEMORY_CAPACITY_EXCEEDED); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + } } /* * Test IRadio.acknowledgeIncomingGsmSmsWithPdu() for the response returned. */ TEST_F(RadioHidlTest, acknowledgeIncomingGsmSmsWithPdu) { - int serial = 0; - bool success = true; - std::string ackPdu = ""; + int serial = GetRandomSerialNumber(); + bool success = true; + std::string ackPdu = ""; - radio->acknowledgeIncomingGsmSmsWithPdu(++serial, success, ackPdu); + radio->acknowledgeIncomingGsmSmsWithPdu(serial, success, ackPdu); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - // TODO(shuoq): Will add error check when we know the expected error from QC - } + if (cardStatus.cardState == CardState::ABSENT) { + // TODO(shuoq): Will add error check when we know the expected error from QC + } } /* * Test IRadio.sendCdmaSms() for the response returned. */ TEST_F(RadioHidlTest, sendCdmaSms) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Create a CdmaSmsAddress - CdmaSmsAddress cdmaSmsAddress; - cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; - cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; - cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; - cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; - cdmaSmsAddress.digits = - (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; - // Create a CdmaSmsSubAddress - CdmaSmsSubaddress cdmaSmsSubaddress; - cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; - cdmaSmsSubaddress.odd = false; - cdmaSmsSubaddress.digits = (std::vector){}; + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; - // Create a CdmaSmsMessage - android::hardware::radio::V1_0::CdmaSmsMessage cdmaSmsMessage; - cdmaSmsMessage.teleserviceId = 4098; - cdmaSmsMessage.isServicePresent = false; - cdmaSmsMessage.serviceCategory = 0; - cdmaSmsMessage.address = cdmaSmsAddress; - cdmaSmsMessage.subAddress = cdmaSmsSubaddress; - cdmaSmsMessage.bearerData = (std::vector){ - 15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + // Create a CdmaSmsMessage + android::hardware::radio::V1_0::CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; - radio->sendCdmaSms(++serial, cdmaSmsMessage); + radio->sendCdmaSms(serial, cdmaSmsMessage); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE); + } } /* * Test IRadio.acknowledgeLastIncomingCdmaSms() for the response returned. */ TEST_F(RadioHidlTest, acknowledgeLastIncomingCdmaSms) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Create a CdmaSmsAck - CdmaSmsAck cdmaSmsAck; - cdmaSmsAck.errorClass = CdmaSmsErrorClass::NO_ERROR; - cdmaSmsAck.smsCauseCode = 1; + // Create a CdmaSmsAck + CdmaSmsAck cdmaSmsAck; + cdmaSmsAck.errorClass = CdmaSmsErrorClass::NO_ERROR; + cdmaSmsAck.smsCauseCode = 1; - radio->acknowledgeLastIncomingCdmaSms(++serial, cdmaSmsAck); + radio->acknowledgeLastIncomingCdmaSms(serial, cdmaSmsAck); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NO_SMS_TO_ACK); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NO_SMS_TO_ACK); + } } /* * Test IRadio.sendImsSms() for the response returned. */ TEST_F(RadioHidlTest, sendImsSms) { - int serial = 1; + int serial = GetRandomSerialNumber(); - // Create a CdmaSmsAddress - CdmaSmsAddress cdmaSmsAddress; - cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; - cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; - cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; - cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; - cdmaSmsAddress.digits = - (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; - // Create a CdmaSmsSubAddress - CdmaSmsSubaddress cdmaSmsSubaddress; - cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; - cdmaSmsSubaddress.odd = false; - cdmaSmsSubaddress.digits = (std::vector){}; + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; - // Create a CdmaSmsMessage - CdmaSmsMessage cdmaSmsMessage; - cdmaSmsMessage.teleserviceId = 4098; - cdmaSmsMessage.isServicePresent = false; - cdmaSmsMessage.serviceCategory = 0; - cdmaSmsMessage.address = cdmaSmsAddress; - cdmaSmsMessage.subAddress = cdmaSmsSubaddress; - cdmaSmsMessage.bearerData = (std::vector){ - 15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + // Create a CdmaSmsMessage + CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; - // Creata an ImsSmsMessage - ImsSmsMessage msg; - msg.tech = RadioTechnologyFamily::THREE_GPP2; - msg.retry = false; - msg.messageRef = 0; - msg.cdmaMessage = (std::vector){cdmaSmsMessage}; - msg.gsmMessage = (std::vector){}; + // Creata an ImsSmsMessage + ImsSmsMessage msg; + msg.tech = RadioTechnologyFamily::THREE_GPP2; + msg.retry = false; + msg.messageRef = 0; + msg.cdmaMessage = (std::vector){cdmaSmsMessage}; + msg.gsmMessage = (std::vector){}; - radio->sendImsSms(serial, msg); + radio->sendImsSms(serial, msg); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + } } /* * Test IRadio.getSmscAddress() for the response returned. */ TEST_F(RadioHidlTest, getSmscAddress) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->getSmscAddress(++serial); + radio->getSmscAddress(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + } } /* * Test IRadio.setSmscAddress() for the response returned. */ TEST_F(RadioHidlTest, setSmscAddress) { - int serial = 0; - hidl_string address = hidl_string("smscAddress"); + int serial = GetRandomSerialNumber(); + hidl_string address = hidl_string("smscAddress"); - radio->setSmscAddress(++serial, address); + radio->setSmscAddress(serial, address); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT); + } } /* * Test IRadio.writeSmsToSim() for the response returned. */ TEST_F(RadioHidlTest, writeSmsToSim) { - int serial = 0; - SmsWriteArgs smsWriteArgs; - smsWriteArgs.status = SmsWriteArgsStatus::REC_UNREAD; - smsWriteArgs.smsc = ""; - smsWriteArgs.pdu = "01000b916105770203f3000006d4f29c3e9b01"; + int serial = GetRandomSerialNumber(); + SmsWriteArgs smsWriteArgs; + smsWriteArgs.status = SmsWriteArgsStatus::REC_UNREAD; + smsWriteArgs.smsc = ""; + smsWriteArgs.pdu = "01000b916105770203f3000006d4f29c3e9b01"; - radio->writeSmsToSim(++serial, smsWriteArgs); + radio->writeSmsToSim(serial, smsWriteArgs); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::ENCODING_ERR || - radioRsp->rspInfo.error == RadioError::NO_RESOURCES || - radioRsp->rspInfo.error == RadioError::NETWORK_NOT_READY || - radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::ENCODING_ERR || + radioRsp->rspInfo.error == RadioError::NO_RESOURCES || + radioRsp->rspInfo.error == RadioError::NETWORK_NOT_READY || + radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); + } } /* * Test IRadio.deleteSmsOnSim() for the response returned. */ TEST_F(RadioHidlTest, deleteSmsOnSim) { - int serial = 0; - int index = 1; + int serial = GetRandomSerialNumber(); + int index = 1; - radio->deleteSmsOnSim(++serial, index); + radio->deleteSmsOnSim(serial, index); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY); + } } /* * Test IRadio.writeSmsToRuim() for the response returned. */ TEST_F(RadioHidlTest, writeSmsToRuim) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Create a CdmaSmsAddress - CdmaSmsAddress cdmaSmsAddress; - cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; - cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; - cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; - cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; - cdmaSmsAddress.digits = - (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; - // Create a CdmaSmsSubAddress - CdmaSmsSubaddress cdmaSmsSubaddress; - cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; - cdmaSmsSubaddress.odd = false; - cdmaSmsSubaddress.digits = (std::vector){}; + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; - // Create a CdmaSmsMessage - CdmaSmsMessage cdmaSmsMessage; - cdmaSmsMessage.teleserviceId = 4098; - cdmaSmsMessage.isServicePresent = false; - cdmaSmsMessage.serviceCategory = 0; - cdmaSmsMessage.address = cdmaSmsAddress; - cdmaSmsMessage.subAddress = cdmaSmsSubaddress; - cdmaSmsMessage.bearerData = (std::vector){ - 15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + // Create a CdmaSmsMessage + CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; - // Create a CdmaSmsWriteArgs - CdmaSmsWriteArgs cdmaSmsWriteArgs; - cdmaSmsWriteArgs.status = CdmaSmsWriteArgsStatus::REC_UNREAD; - cdmaSmsWriteArgs.message = cdmaSmsMessage; + // Create a CdmaSmsWriteArgs + CdmaSmsWriteArgs cdmaSmsWriteArgs; + cdmaSmsWriteArgs.status = CdmaSmsWriteArgsStatus::REC_UNREAD; + cdmaSmsWriteArgs.message = cdmaSmsMessage; - radio->writeSmsToRuim(++serial, cdmaSmsWriteArgs); + radio->writeSmsToRuim(serial, cdmaSmsWriteArgs); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY || - radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY || + radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS); + } } /* * Test IRadio.deleteSmsOnRuim() for the response returned. */ TEST_F(RadioHidlTest, deleteSmsOnRuim) { - int serial = 0; - int index = 1; + int serial = GetRandomSerialNumber(); + int index = 1; - // Create a CdmaSmsAddress - CdmaSmsAddress cdmaSmsAddress; - cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; - cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; - cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; - cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; - cdmaSmsAddress.digits = - (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; - // Create a CdmaSmsSubAddress - CdmaSmsSubaddress cdmaSmsSubaddress; - cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; - cdmaSmsSubaddress.odd = false; - cdmaSmsSubaddress.digits = (std::vector){}; + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; - // Create a CdmaSmsMessage - CdmaSmsMessage cdmaSmsMessage; - cdmaSmsMessage.teleserviceId = 4098; - cdmaSmsMessage.isServicePresent = false; - cdmaSmsMessage.serviceCategory = 0; - cdmaSmsMessage.address = cdmaSmsAddress; - cdmaSmsMessage.subAddress = cdmaSmsSubaddress; - cdmaSmsMessage.bearerData = (std::vector){ - 15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + // Create a CdmaSmsMessage + CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; - // Create a CdmaSmsWriteArgs - CdmaSmsWriteArgs cdmaSmsWriteArgs; - cdmaSmsWriteArgs.status = CdmaSmsWriteArgsStatus::REC_UNREAD; - cdmaSmsWriteArgs.message = cdmaSmsMessage; + // Create a CdmaSmsWriteArgs + CdmaSmsWriteArgs cdmaSmsWriteArgs; + cdmaSmsWriteArgs.status = CdmaSmsWriteArgsStatus::REC_UNREAD; + cdmaSmsWriteArgs.message = cdmaSmsMessage; - radio->deleteSmsOnRuim(++serial, index); + radio->deleteSmsOnRuim(serial, index); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError()); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError()); + } } /* * Test IRadio.reportSmsMemoryStatus() for the response returned. */ TEST_F(RadioHidlTest, reportSmsMemoryStatus) { - int serial = 0; - bool available = true; + int serial = GetRandomSerialNumber(); + bool available = true; - radio->reportSmsMemoryStatus(++serial, available); + radio->reportSmsMemoryStatus(serial, available); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp index b02a740ceb..4c76c45fec 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp @@ -22,101 +22,109 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.sendEnvelope() for the response returned. */ TEST_F(RadioHidlTest, sendEnvelope) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Test with sending empty string - std::string content = ""; + // Test with sending empty string + std::string content = ""; - radio->sendEnvelope(++serial, content); + radio->sendEnvelope(serial, content); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } - // Test with sending random string - content = "0"; + // Test with sending random string + serial = GetRandomSerialNumber(); + content = "0"; - radio->sendEnvelope(++serial, content); + radio->sendEnvelope(serial, content); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.sendTerminalResponseToSim() for the response returned. */ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Test with sending empty string - std::string commandResponse = ""; + // Test with sending empty string + std::string commandResponse = ""; - radio->sendTerminalResponseToSim(++serial, commandResponse); + radio->sendTerminalResponseToSim(serial, commandResponse); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } - // Test with sending random string - commandResponse = "0"; + serial = GetRandomSerialNumber(); - radio->sendTerminalResponseToSim(++serial, commandResponse); + // Test with sending random string + commandResponse = "0"; - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->sendTerminalResponseToSim(serial, commandResponse); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* * Test IRadio.handleStkCallSetupRequestFromSim() for the response returned. */ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) { - int serial = 0; - bool accept = false; + int serial = GetRandomSerialNumber(); + bool accept = false; - radio->handleStkCallSetupRequestFromSim(++serial, accept); + radio->handleStkCallSetupRequestFromSim(serial, accept); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || + radioRsp->rspInfo.error == RadioError::NO_MEMORY || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); + } } /* * Test IRadio.reportStkServiceIsRunning() for the response returned. */ TEST_F(RadioHidlTest, reportStkServiceIsRunning) { - int serial = 0; + int serial = GetRandomSerialNumber(); - radio->reportStkServiceIsRunning(++serial); + radio->reportStkServiceIsRunning(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } } /* @@ -124,31 +132,32 @@ TEST_F(RadioHidlTest, reportStkServiceIsRunning) { * string. */ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { - int serial = 0; + int serial = GetRandomSerialNumber(); - // Test with sending empty string - std::string contents = ""; + // Test with sending empty string + std::string contents = ""; - radio->sendEnvelopeWithStatus(++serial, contents); + radio->sendEnvelopeWithStatus(serial, contents); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + } - // Test with sending random string - contents = "0"; + // Test with sending random string + serial = GetRandomSerialNumber(); + contents = "0"; - radio->sendEnvelopeWithStatus(++serial, contents); + radio->sendEnvelopeWithStatus(serial, contents); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_FALSE(RadioError::NONE == radioRsp->rspInfo.error); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_FALSE(RadioError::NONE == radioRsp->rspInfo.error); + } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp index 794c60f2f8..1aa9d6c9f0 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -17,46 +17,47 @@ #include void RadioHidlTest::SetUp() { - radio = ::testing::VtsHalHidlTargetTestBase::getService( - hidl_string(RADIO_SERVICE_NAME)); - ASSERT_NE(radio, nullptr); + radio = + ::testing::VtsHalHidlTargetTestBase::getService(hidl_string(RADIO_SERVICE_NAME)); + ASSERT_NE(radio, nullptr); - radioRsp = new RadioResponse(*this); - ASSERT_NE(radioRsp, nullptr); + radioRsp = new RadioResponse(*this); + ASSERT_NE(radioRsp, nullptr); - count = 0; + count = 0; - radioInd = NULL; - radio->setResponseFunctions(radioRsp, radioInd); + radioInd = NULL; + radio->setResponseFunctions(radioRsp, radioInd); - radio->getIccCardStatus(1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(1, radioRsp->rspInfo.serial); - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + int serial = GetRandomSerialNumber(); + radio->getIccCardStatus(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } void RadioHidlTest::TearDown() {} void RadioHidlTest::notify() { - std::unique_lock lock(mtx); - count++; - cv.notify_one(); + std::unique_lock lock(mtx); + count++; + cv.notify_one(); } std::cv_status RadioHidlTest::wait() { - std::unique_lock lock(mtx); + std::unique_lock lock(mtx); - std::cv_status status = std::cv_status::no_timeout; - auto now = std::chrono::system_clock::now(); - while (count == 0) { - status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD)); - if (status == std::cv_status::timeout) { - return status; + std::cv_status status = std::cv_status::no_timeout; + auto now = std::chrono::system_clock::now(); + while (count == 0) { + status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD)); + if (status == std::cv_status::timeout) { + return status; + } } - } - count--; - return status; + count--; + return status; } bool RadioHidlTest::CheckGeneralError() { diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils.h b/radio/1.0/vts/functional/radio_hidl_hal_utils.h index 735e5759cc..3c46e79854 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils.h @@ -26,6 +26,8 @@ #include #include +#include + using ::android::hardware::radio::V1_0::ActivityStatsInfo; using ::android::hardware::radio::V1_0::AppType; using ::android::hardware::radio::V1_0::CardStatus; @@ -88,432 +90,388 @@ extern CardStatus cardStatus; /* Callback class for radio response */ class RadioResponse : public IRadioResponse { - private: - RadioHidlTest& parent; + private: + RadioHidlTest& parent; - public: - RadioResponseInfo rspInfo; - hidl_string imsi; - IccIoResult iccIoResult; - int channelId; + public: + RadioResponseInfo rspInfo; + hidl_string imsi; + IccIoResult iccIoResult; + int channelId; - // Sms - SendSmsResult sendSmsResult; - hidl_string smscAddress; - uint32_t writeSmsToSimIndex; - uint32_t writeSmsToRuimIndex; + // Sms + SendSmsResult sendSmsResult; + hidl_string smscAddress; + uint32_t writeSmsToSimIndex; + uint32_t writeSmsToRuimIndex; - RadioResponse(RadioHidlTest& parent); + RadioResponse(RadioHidlTest& parent); - virtual ~RadioResponse() = default; + virtual ~RadioResponse() = default; - Return getIccCardStatusResponse(const RadioResponseInfo& info, - const CardStatus& cardStatus); + Return getIccCardStatusResponse(const RadioResponseInfo& info, + const CardStatus& cardStatus); - Return supplyIccPinForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPinForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPukForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPukForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPin2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPin2ForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPuk2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPuk2ForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return changeIccPinForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return changeIccPinForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return changeIccPin2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return changeIccPin2ForAppResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyNetworkDepersonalizationResponse( - const RadioResponseInfo& info, int32_t remainingRetries); + Return supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, + int32_t remainingRetries); - Return getCurrentCallsResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& calls); + Return getCurrentCallsResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& calls); - Return dialResponse(const RadioResponseInfo& info); + Return dialResponse(const RadioResponseInfo& info); - Return getIMSIForAppResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& imsi); + Return getIMSIForAppResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& imsi); - Return hangupConnectionResponse(const RadioResponseInfo& info); + Return hangupConnectionResponse(const RadioResponseInfo& info); - Return hangupWaitingOrBackgroundResponse(const RadioResponseInfo& info); + Return hangupWaitingOrBackgroundResponse(const RadioResponseInfo& info); - Return hangupForegroundResumeBackgroundResponse( - const RadioResponseInfo& info); + Return hangupForegroundResumeBackgroundResponse(const RadioResponseInfo& info); - Return switchWaitingOrHoldingAndActiveResponse( - const RadioResponseInfo& info); + Return switchWaitingOrHoldingAndActiveResponse(const RadioResponseInfo& info); - Return conferenceResponse(const RadioResponseInfo& info); + Return conferenceResponse(const RadioResponseInfo& info); - Return rejectCallResponse(const RadioResponseInfo& info); + Return rejectCallResponse(const RadioResponseInfo& info); - Return getLastCallFailCauseResponse( - const RadioResponseInfo& info, - const LastCallFailCauseInfo& failCauseInfo); + Return getLastCallFailCauseResponse(const RadioResponseInfo& info, + const LastCallFailCauseInfo& failCauseInfo); - Return getSignalStrengthResponse(const RadioResponseInfo& info, - const SignalStrength& sigStrength); + Return getSignalStrengthResponse(const RadioResponseInfo& info, + const SignalStrength& sigStrength); - Return getVoiceRegistrationStateResponse( - const RadioResponseInfo& info, - const VoiceRegStateResult& voiceRegResponse); + Return getVoiceRegistrationStateResponse(const RadioResponseInfo& info, + const VoiceRegStateResult& voiceRegResponse); - Return getDataRegistrationStateResponse( - const RadioResponseInfo& info, const DataRegStateResult& dataRegResponse); + Return getDataRegistrationStateResponse(const RadioResponseInfo& info, + const DataRegStateResult& dataRegResponse); - Return getOperatorResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& longName, - const ::android::hardware::hidl_string& shortName, - const ::android::hardware::hidl_string& numeric); + Return getOperatorResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& longName, + const ::android::hardware::hidl_string& shortName, + const ::android::hardware::hidl_string& numeric); - Return setRadioPowerResponse(const RadioResponseInfo& info); + Return setRadioPowerResponse(const RadioResponseInfo& info); - Return sendDtmfResponse(const RadioResponseInfo& info); + Return sendDtmfResponse(const RadioResponseInfo& info); - Return sendSmsResponse(const RadioResponseInfo& info, - const SendSmsResult& sms); + Return sendSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); - Return sendSMSExpectMoreResponse(const RadioResponseInfo& info, - const SendSmsResult& sms); + Return sendSMSExpectMoreResponse(const RadioResponseInfo& info, const SendSmsResult& sms); - Return setupDataCallResponse(const RadioResponseInfo& info, - const SetupDataCallResult& dcResponse); + Return setupDataCallResponse(const RadioResponseInfo& info, + const SetupDataCallResult& dcResponse); - Return iccIOForAppResponse(const RadioResponseInfo& info, - const IccIoResult& iccIo); + Return iccIOForAppResponse(const RadioResponseInfo& info, const IccIoResult& iccIo); - Return sendUssdResponse(const RadioResponseInfo& info); + Return sendUssdResponse(const RadioResponseInfo& info); - Return cancelPendingUssdResponse(const RadioResponseInfo& info); + Return cancelPendingUssdResponse(const RadioResponseInfo& info); - Return getClirResponse(const RadioResponseInfo& info, int32_t n, - int32_t m); + Return getClirResponse(const RadioResponseInfo& info, int32_t n, int32_t m); - Return setClirResponse(const RadioResponseInfo& info); + Return setClirResponse(const RadioResponseInfo& info); - Return getCallForwardStatusResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& call_forwardInfos); + Return getCallForwardStatusResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& call_forwardInfos); - Return setCallForwardResponse(const RadioResponseInfo& info); + Return setCallForwardResponse(const RadioResponseInfo& info); - Return getCallWaitingResponse(const RadioResponseInfo& info, - bool enable, int32_t serviceClass); + Return getCallWaitingResponse(const RadioResponseInfo& info, bool enable, + int32_t serviceClass); - Return setCallWaitingResponse(const RadioResponseInfo& info); + Return setCallWaitingResponse(const RadioResponseInfo& info); - Return acknowledgeLastIncomingGsmSmsResponse( - const RadioResponseInfo& info); + Return acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info); - Return acceptCallResponse(const RadioResponseInfo& info); + Return acceptCallResponse(const RadioResponseInfo& info); - Return deactivateDataCallResponse(const RadioResponseInfo& info); + Return deactivateDataCallResponse(const RadioResponseInfo& info); - Return getFacilityLockForAppResponse(const RadioResponseInfo& info, - int32_t response); + Return getFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t response); - Return setFacilityLockForAppResponse(const RadioResponseInfo& info, - int32_t retry); + Return setFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t retry); - Return setBarringPasswordResponse(const RadioResponseInfo& info); + Return setBarringPasswordResponse(const RadioResponseInfo& info); - Return getNetworkSelectionModeResponse(const RadioResponseInfo& info, - bool manual); + Return getNetworkSelectionModeResponse(const RadioResponseInfo& info, bool manual); - Return setNetworkSelectionModeAutomaticResponse( - const RadioResponseInfo& info); + Return setNetworkSelectionModeAutomaticResponse(const RadioResponseInfo& info); - Return setNetworkSelectionModeManualResponse( - const RadioResponseInfo& info); + Return setNetworkSelectionModeManualResponse(const RadioResponseInfo& info); - Return getAvailableNetworksResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& networkInfos); + Return getAvailableNetworksResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& networkInfos); - Return startDtmfResponse(const RadioResponseInfo& info); + Return startDtmfResponse(const RadioResponseInfo& info); - Return stopDtmfResponse(const RadioResponseInfo& info); + Return stopDtmfResponse(const RadioResponseInfo& info); - Return getBasebandVersionResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& version); + Return getBasebandVersionResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& version); - Return separateConnectionResponse(const RadioResponseInfo& info); + Return separateConnectionResponse(const RadioResponseInfo& info); - Return setMuteResponse(const RadioResponseInfo& info); + Return setMuteResponse(const RadioResponseInfo& info); - Return getMuteResponse(const RadioResponseInfo& info, bool enable); + Return getMuteResponse(const RadioResponseInfo& info, bool enable); - Return getClipResponse(const RadioResponseInfo& info, - ClipStatus status); + Return getClipResponse(const RadioResponseInfo& info, ClipStatus status); - Return getDataCallListResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& dcResponse); + Return getDataCallListResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& dcResponse); - Return sendOemRilRequestRawResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& data); + Return sendOemRilRequestRawResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& data); - Return sendOemRilRequestStringsResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& - data); + Return sendOemRilRequestStringsResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data); - Return setSuppServiceNotificationsResponse( - const RadioResponseInfo& info); + Return setSuppServiceNotificationsResponse(const RadioResponseInfo& info); - Return writeSmsToSimResponse(const RadioResponseInfo& info, - int32_t index); + Return writeSmsToSimResponse(const RadioResponseInfo& info, int32_t index); - Return deleteSmsOnSimResponse(const RadioResponseInfo& info); + Return deleteSmsOnSimResponse(const RadioResponseInfo& info); - Return setBandModeResponse(const RadioResponseInfo& info); + Return setBandModeResponse(const RadioResponseInfo& info); - Return getAvailableBandModesResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& bandModes); + Return getAvailableBandModesResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& bandModes); - Return sendEnvelopeResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& commandResponse); + Return sendEnvelopeResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& commandResponse); - Return sendTerminalResponseToSimResponse(const RadioResponseInfo& info); + Return sendTerminalResponseToSimResponse(const RadioResponseInfo& info); - Return handleStkCallSetupRequestFromSimResponse( - const RadioResponseInfo& info); + Return handleStkCallSetupRequestFromSimResponse(const RadioResponseInfo& info); - Return explicitCallTransferResponse(const RadioResponseInfo& info); + Return explicitCallTransferResponse(const RadioResponseInfo& info); - Return setPreferredNetworkTypeResponse(const RadioResponseInfo& info); + Return setPreferredNetworkTypeResponse(const RadioResponseInfo& info); - Return getPreferredNetworkTypeResponse(const RadioResponseInfo& info, - PreferredNetworkType nwType); + Return getPreferredNetworkTypeResponse(const RadioResponseInfo& info, + PreferredNetworkType nwType); - Return getNeighboringCidsResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& cells); + Return getNeighboringCidsResponse( + const RadioResponseInfo& info, const ::android::hardware::hidl_vec& cells); - Return setLocationUpdatesResponse(const RadioResponseInfo& info); + Return setLocationUpdatesResponse(const RadioResponseInfo& info); - Return setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info); + Return setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info); - Return setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info); + Return setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info); - Return getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info, - CdmaRoamingType type); + Return getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info, + CdmaRoamingType type); - Return setTTYModeResponse(const RadioResponseInfo& info); + Return setTTYModeResponse(const RadioResponseInfo& info); - Return getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode); + Return getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode); - Return setPreferredVoicePrivacyResponse(const RadioResponseInfo& info); + Return setPreferredVoicePrivacyResponse(const RadioResponseInfo& info); - Return getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, - bool enable); + Return getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, bool enable); - Return sendCDMAFeatureCodeResponse(const RadioResponseInfo& info); + Return sendCDMAFeatureCodeResponse(const RadioResponseInfo& info); - Return sendBurstDtmfResponse(const RadioResponseInfo& info); + Return sendBurstDtmfResponse(const RadioResponseInfo& info); - Return sendCdmaSmsResponse(const RadioResponseInfo& info, - const SendSmsResult& sms); + Return sendCdmaSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); - Return acknowledgeLastIncomingCdmaSmsResponse( - const RadioResponseInfo& info); + Return acknowledgeLastIncomingCdmaSmsResponse(const RadioResponseInfo& info); - Return getGsmBroadcastConfigResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& configs); + Return getGsmBroadcastConfigResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& configs); - Return setGsmBroadcastConfigResponse(const RadioResponseInfo& info); + Return setGsmBroadcastConfigResponse(const RadioResponseInfo& info); - Return setGsmBroadcastActivationResponse(const RadioResponseInfo& info); + Return setGsmBroadcastActivationResponse(const RadioResponseInfo& info); - Return getCdmaBroadcastConfigResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& configs); + Return getCdmaBroadcastConfigResponse( + const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& configs); - Return setCdmaBroadcastConfigResponse(const RadioResponseInfo& info); + Return setCdmaBroadcastConfigResponse(const RadioResponseInfo& info); - Return setCdmaBroadcastActivationResponse( - const RadioResponseInfo& info); + Return setCdmaBroadcastActivationResponse(const RadioResponseInfo& info); - Return getCDMASubscriptionResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& mdn, - const ::android::hardware::hidl_string& hSid, - const ::android::hardware::hidl_string& hNid, - const ::android::hardware::hidl_string& min, - const ::android::hardware::hidl_string& prl); + Return getCDMASubscriptionResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& mdn, + const ::android::hardware::hidl_string& hSid, + const ::android::hardware::hidl_string& hNid, + const ::android::hardware::hidl_string& min, + const ::android::hardware::hidl_string& prl); - Return writeSmsToRuimResponse(const RadioResponseInfo& info, - uint32_t index); + Return writeSmsToRuimResponse(const RadioResponseInfo& info, uint32_t index); - Return deleteSmsOnRuimResponse(const RadioResponseInfo& info); + Return deleteSmsOnRuimResponse(const RadioResponseInfo& info); - Return getDeviceIdentityResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& imei, - const ::android::hardware::hidl_string& imeisv, - const ::android::hardware::hidl_string& esn, - const ::android::hardware::hidl_string& meid); + Return getDeviceIdentityResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& imei, + const ::android::hardware::hidl_string& imeisv, + const ::android::hardware::hidl_string& esn, + const ::android::hardware::hidl_string& meid); - Return exitEmergencyCallbackModeResponse(const RadioResponseInfo& info); + Return exitEmergencyCallbackModeResponse(const RadioResponseInfo& info); - Return getSmscAddressResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& smsc); + Return getSmscAddressResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& smsc); - Return setSmscAddressResponse(const RadioResponseInfo& info); + Return setSmscAddressResponse(const RadioResponseInfo& info); - Return reportSmsMemoryStatusResponse(const RadioResponseInfo& info); + Return reportSmsMemoryStatusResponse(const RadioResponseInfo& info); - Return reportStkServiceIsRunningResponse(const RadioResponseInfo& info); + Return reportStkServiceIsRunningResponse(const RadioResponseInfo& info); - Return getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info, - CdmaSubscriptionSource source); + Return getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info, + CdmaSubscriptionSource source); - Return requestIsimAuthenticationResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& response); + Return requestIsimAuthenticationResponse( + const RadioResponseInfo& info, const ::android::hardware::hidl_string& response); - Return acknowledgeIncomingGsmSmsWithPduResponse( - const RadioResponseInfo& info); + Return acknowledgeIncomingGsmSmsWithPduResponse(const RadioResponseInfo& info); - Return sendEnvelopeWithStatusResponse(const RadioResponseInfo& info, - const IccIoResult& iccIo); + Return sendEnvelopeWithStatusResponse(const RadioResponseInfo& info, + const IccIoResult& iccIo); - Return getVoiceRadioTechnologyResponse(const RadioResponseInfo& info, - RadioTechnology rat); + Return getVoiceRadioTechnologyResponse(const RadioResponseInfo& info, + RadioTechnology rat); - Return getCellInfoListResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& cellInfo); + Return getCellInfoListResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_vec& cellInfo); - Return setCellInfoListRateResponse(const RadioResponseInfo& info); + Return setCellInfoListRateResponse(const RadioResponseInfo& info); - Return setInitialAttachApnResponse(const RadioResponseInfo& info); + Return setInitialAttachApnResponse(const RadioResponseInfo& info); - Return getImsRegistrationStateResponse(const RadioResponseInfo& info, - bool isRegistered, - RadioTechnologyFamily ratFamily); + Return getImsRegistrationStateResponse(const RadioResponseInfo& info, bool isRegistered, + RadioTechnologyFamily ratFamily); - Return sendImsSmsResponse(const RadioResponseInfo& info, - const SendSmsResult& sms); + Return sendImsSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); - Return iccTransmitApduBasicChannelResponse( - const RadioResponseInfo& info, const IccIoResult& result); + Return iccTransmitApduBasicChannelResponse(const RadioResponseInfo& info, + const IccIoResult& result); - Return iccOpenLogicalChannelResponse( - const RadioResponseInfo& info, int32_t channelId, - const ::android::hardware::hidl_vec& selectResponse); + Return iccOpenLogicalChannelResponse( + const RadioResponseInfo& info, int32_t channelId, + const ::android::hardware::hidl_vec& selectResponse); - Return iccCloseLogicalChannelResponse(const RadioResponseInfo& info); + Return iccCloseLogicalChannelResponse(const RadioResponseInfo& info); - Return iccTransmitApduLogicalChannelResponse( - const RadioResponseInfo& info, const IccIoResult& result); + Return iccTransmitApduLogicalChannelResponse(const RadioResponseInfo& info, + const IccIoResult& result); - Return nvReadItemResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& result); + Return nvReadItemResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& result); - Return nvWriteItemResponse(const RadioResponseInfo& info); + Return nvWriteItemResponse(const RadioResponseInfo& info); - Return nvWriteCdmaPrlResponse(const RadioResponseInfo& info); + Return nvWriteCdmaPrlResponse(const RadioResponseInfo& info); - Return nvResetConfigResponse(const RadioResponseInfo& info); + Return nvResetConfigResponse(const RadioResponseInfo& info); - Return setUiccSubscriptionResponse(const RadioResponseInfo& info); + Return setUiccSubscriptionResponse(const RadioResponseInfo& info); - Return setDataAllowedResponse(const RadioResponseInfo& info); + Return setDataAllowedResponse(const RadioResponseInfo& info); - Return getHardwareConfigResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& config); + Return getHardwareConfigResponse( + const RadioResponseInfo& info, const ::android::hardware::hidl_vec& config); - Return requestIccSimAuthenticationResponse( - const RadioResponseInfo& info, const IccIoResult& result); + Return requestIccSimAuthenticationResponse(const RadioResponseInfo& info, + const IccIoResult& result); - Return setDataProfileResponse(const RadioResponseInfo& info); + Return setDataProfileResponse(const RadioResponseInfo& info); - Return requestShutdownResponse(const RadioResponseInfo& info); + Return requestShutdownResponse(const RadioResponseInfo& info); - Return getRadioCapabilityResponse(const RadioResponseInfo& info, - const RadioCapability& rc); + Return getRadioCapabilityResponse(const RadioResponseInfo& info, + const RadioCapability& rc); - Return setRadioCapabilityResponse(const RadioResponseInfo& info, - const RadioCapability& rc); + Return setRadioCapabilityResponse(const RadioResponseInfo& info, + const RadioCapability& rc); - Return startLceServiceResponse(const RadioResponseInfo& info, - const LceStatusInfo& statusInfo); + Return startLceServiceResponse(const RadioResponseInfo& info, + const LceStatusInfo& statusInfo); - Return stopLceServiceResponse(const RadioResponseInfo& info, - const LceStatusInfo& statusInfo); + Return stopLceServiceResponse(const RadioResponseInfo& info, + const LceStatusInfo& statusInfo); - Return pullLceDataResponse(const RadioResponseInfo& info, - const LceDataInfo& lceInfo); + Return pullLceDataResponse(const RadioResponseInfo& info, const LceDataInfo& lceInfo); - Return getModemActivityInfoResponse( - const RadioResponseInfo& info, const ActivityStatsInfo& activityInfo); + Return getModemActivityInfoResponse(const RadioResponseInfo& info, + const ActivityStatsInfo& activityInfo); - Return setAllowedCarriersResponse(const RadioResponseInfo& info, - int32_t numAllowed); + Return setAllowedCarriersResponse(const RadioResponseInfo& info, int32_t numAllowed); - Return getAllowedCarriersResponse(const RadioResponseInfo& info, - bool allAllowed, - const CarrierRestrictions& carriers); + Return getAllowedCarriersResponse(const RadioResponseInfo& info, bool allAllowed, + const CarrierRestrictions& carriers); - Return sendDeviceStateResponse(const RadioResponseInfo& info); + Return sendDeviceStateResponse(const RadioResponseInfo& info); - Return setIndicationFilterResponse(const RadioResponseInfo& info); + Return setIndicationFilterResponse(const RadioResponseInfo& info); - Return setSimCardPowerResponse(const RadioResponseInfo& info); + Return setSimCardPowerResponse(const RadioResponseInfo& info); - Return acknowledgeRequest(int32_t serial); + Return acknowledgeRequest(int32_t serial); }; // The main test class for Radio HIDL. class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - std::mutex mtx; - std::condition_variable cv; - int count; + private: + std::mutex mtx; + std::condition_variable cv; + int count; - public: - virtual void SetUp() override; + public: + virtual void SetUp() override; - virtual void TearDown() override; + virtual void TearDown() override; - /* Used as a mechanism to inform the test about data/event callback */ - void notify(); + /* Used as a mechanism to inform the test about data/event callback */ + void notify(); - /* Test code calls this function to wait for response */ - std::cv_status wait(); + /* Test code calls this function to wait for response */ + std::cv_status wait(); - /* Used for checking General Errors */ - bool CheckGeneralError(); + /* Used for checking General Errors */ + bool CheckGeneralError(); - /* Used for checking OEM Errors */ - bool CheckOEMError(); + /* Used for checking OEM Errors */ + bool CheckOEMError(); - sp radio; - sp radioRsp; - sp radioInd; + sp radio; + sp radioRsp; + sp radioInd; }; // A class for test environment setup class RadioHidlEnvironment : public ::testing::Environment { - public: - virtual void SetUp() {} - virtual void TearDown() {} + public: + virtual void SetUp() {} + virtual void TearDown() {} }; \ No newline at end of file diff --git a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp index b96269a3a3..95d00e32fc 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp @@ -20,477 +20,467 @@ * Test IRadio.getCurrentCalls() for the response returned. */ TEST_F(RadioHidlTest, getCurrentCalls) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCurrentCalls(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCurrentCalls(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.dial() for the response returned. */ TEST_F(RadioHidlTest, dial) { - int serial = 1; + int serial = GetRandomSerialNumber(); - Dial dialInfo; - memset(&dialInfo, 0, sizeof(dialInfo)); - dialInfo.address = hidl_string("123456789"); + Dial dialInfo; + memset(&dialInfo, 0, sizeof(dialInfo)); + dialInfo.address = hidl_string("123456789"); - radio->dial(serial, dialInfo); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->dial(serial, dialInfo); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE || - radioRsp->rspInfo.error == RadioError::NO_SUBSCRIPTION || - radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || - radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::CANCELLED); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::FDN_CHECK_FAILURE || + radioRsp->rspInfo.error == RadioError::NO_SUBSCRIPTION || + radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND || + radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || + radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || + radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || + radioRsp->rspInfo.error == RadioError::CANCELLED); + } } /* * Test IRadio.hangup() for the response returned. */ TEST_F(RadioHidlTest, hangup) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->hangup(serial, 1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->hangup(serial, 1); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.hangupWaitingOrBackground() for the response returned. */ TEST_F(RadioHidlTest, hangupWaitingOrBackground) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->hangupWaitingOrBackground(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->hangupWaitingOrBackground(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.hangupForegroundResumeBackground() for the response returned. */ TEST_F(RadioHidlTest, hangupForegroundResumeBackground) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->hangupForegroundResumeBackground(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->hangupForegroundResumeBackground(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.switchWaitingOrHoldingAndActive() for the response returned. */ TEST_F(RadioHidlTest, switchWaitingOrHoldingAndActive) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->switchWaitingOrHoldingAndActive(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->switchWaitingOrHoldingAndActive(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.conference() for the response returned. */ TEST_F(RadioHidlTest, conference) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->conference(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->conference(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.rejectCall() for the response returned. */ TEST_F(RadioHidlTest, rejectCall) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->rejectCall(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->rejectCall(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getLastCallFailCause() for the response returned. */ TEST_F(RadioHidlTest, getLastCallFailCause) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getLastCallFailCause(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getLastCallFailCause(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.sendUssd() for the response returned. */ TEST_F(RadioHidlTest, sendUssd) { - int serial = 1; - radio->sendUssd(serial, hidl_string("test")); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + int serial = GetRandomSerialNumber(); + radio->sendUssd(serial, hidl_string("test")); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.cancelPendingUssd() for the response returned. */ TEST_F(RadioHidlTest, cancelPendingUssd) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->cancelPendingUssd(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->cancelPendingUssd(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getCallForwardStatus() for the response returned. */ TEST_F(RadioHidlTest, getCallForwardStatus) { - int serial = 1; - CallForwardInfo callInfo; - memset(&callInfo, 0, sizeof(callInfo)); - callInfo.number = hidl_string(); + int serial = GetRandomSerialNumber(); + CallForwardInfo callInfo; + memset(&callInfo, 0, sizeof(callInfo)); + callInfo.number = hidl_string(); - radio->getCallForwardStatus(serial, callInfo); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCallForwardStatus(serial, callInfo); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setCallForward() for the response returned. */ TEST_F(RadioHidlTest, setCallForward) { - int serial = 1; - CallForwardInfo callInfo; - memset(&callInfo, 0, sizeof(callInfo)); - callInfo.number = hidl_string(); + int serial = GetRandomSerialNumber(); + CallForwardInfo callInfo; + memset(&callInfo, 0, sizeof(callInfo)); + callInfo.number = hidl_string(); - radio->setCallForward(serial, callInfo); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setCallForward(serial, callInfo); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.getCallWaiting() for the response returned. */ TEST_F(RadioHidlTest, getCallWaiting) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getCallWaiting(serial, 1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getCallWaiting(serial, 1); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setCallWaiting() for the response returned. */ TEST_F(RadioHidlTest, setCallWaiting) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setCallWaiting(serial, true, 1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setCallWaiting(serial, true, 1); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.acceptCall() for the response returned. */ TEST_F(RadioHidlTest, acceptCall) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->acceptCall(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->acceptCall(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.separateConnection() for the response returned. */ TEST_F(RadioHidlTest, separateConnection) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->separateConnection(serial, 1); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->separateConnection(serial, 1); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.explicitCallTransfer() for the response returned. */ TEST_F(RadioHidlTest, explicitCallTransfer) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->explicitCallTransfer(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->explicitCallTransfer(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.sendCDMAFeatureCode() for the response returned. */ TEST_F(RadioHidlTest, sendCDMAFeatureCode) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->sendCDMAFeatureCode(serial, hidl_string()); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->sendCDMAFeatureCode(serial, hidl_string()); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || + radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.sendDtmf() for the response returned. */ TEST_F(RadioHidlTest, sendDtmf) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->sendDtmf(serial, "1"); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->sendDtmf(serial, "1"); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.startDtmf() for the response returned. */ TEST_F(RadioHidlTest, startDtmf) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->startDtmf(serial, "1"); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->startDtmf(serial, "1"); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.stopDtmf() for the response returned. */ TEST_F(RadioHidlTest, stopDtmf) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->stopDtmf(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->stopDtmf(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } /* * Test IRadio.setMute() for the response returned. */ TEST_F(RadioHidlTest, setMute) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->setMute(serial, true); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->setMute(serial, true); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.getMute() for the response returned. */ TEST_F(RadioHidlTest, getMute) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->getMute(serial); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->getMute(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + } } /* * Test IRadio.sendBurstDtmf() for the response returned. */ TEST_F(RadioHidlTest, sendBurstDtmf) { - int serial = 1; + int serial = GetRandomSerialNumber(); - radio->sendBurstDtmf(serial, "1", 0, 0); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - EXPECT_EQ(serial, radioRsp->rspInfo.serial); + radio->sendBurstDtmf(serial, "1", 0, 0); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); + EXPECT_EQ(serial, radioRsp->rspInfo.serial); - if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); - } + if (cardStatus.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckGeneralError() || + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::INVALID_STATE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); + } } \ No newline at end of file diff --git a/radio/1.0/vts/functional/radio_response.cpp b/radio/1.0/vts/functional/radio_response.cpp index 22c20a5585..ef887ebd28 100644 --- a/radio/1.0/vts/functional/radio_response.cpp +++ b/radio/1.0/vts/functional/radio_response.cpp @@ -20,953 +20,884 @@ CardStatus cardStatus; RadioResponse::RadioResponse(RadioHidlTest& parent) : parent(parent) {} -Return RadioResponse::getIccCardStatusResponse( - const RadioResponseInfo& info, const CardStatus& card_status) { - rspInfo = info; - cardStatus = card_status; - parent.notify(); - return Void(); +Return RadioResponse::getIccCardStatusResponse(const RadioResponseInfo& info, + const CardStatus& card_status) { + rspInfo = info; + cardStatus = card_status; + parent.notify(); + return Void(); } -Return RadioResponse::supplyIccPinForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::supplyIccPinForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::supplyIccPukForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::supplyIccPukForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::supplyIccPin2ForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::supplyIccPin2ForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::supplyIccPuk2ForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::supplyIccPuk2ForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::changeIccPinForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::changeIccPinForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::changeIccPin2ForAppResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::changeIccPin2ForAppResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::supplyNetworkDepersonalizationResponse( - const RadioResponseInfo& info, int32_t /*remainingRetries*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, + int32_t /*remainingRetries*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getCurrentCallsResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& /*calls*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*calls*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::dialResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getIMSIForAppResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& imsi) { - rspInfo = info; - this->imsi = imsi; - parent.notify(); - return Void(); +Return RadioResponse::getIMSIForAppResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& imsi) { + rspInfo = info; + this->imsi = imsi; + parent.notify(); + return Void(); } -Return RadioResponse::hangupConnectionResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::hangupConnectionResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::hangupWaitingOrBackgroundResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::hangupWaitingOrBackgroundResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::hangupForegroundResumeBackgroundResponse( const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::switchWaitingOrHoldingAndActiveResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::switchWaitingOrHoldingAndActiveResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::conferenceResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::rejectCallResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getLastCallFailCauseResponse( - const RadioResponseInfo& info, - const LastCallFailCauseInfo& /*failCauseInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const LastCallFailCauseInfo& /*failCauseInfo*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getSignalStrengthResponse( - const RadioResponseInfo& info, const SignalStrength& /*sig_strength*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getSignalStrengthResponse(const RadioResponseInfo& info, + const SignalStrength& /*sig_strength*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getVoiceRegistrationStateResponse( - const RadioResponseInfo& info, - const VoiceRegStateResult& /*voiceRegResponse*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const VoiceRegStateResult& /*voiceRegResponse*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getDataRegistrationStateResponse( - const RadioResponseInfo& info, - const DataRegStateResult& /*dataRegResponse*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const DataRegStateResult& /*dataRegResponse*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getOperatorResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*longName*/, + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*longName*/, const ::android::hardware::hidl_string& /*shortName*/, const ::android::hardware::hidl_string& /*numeric*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setRadioPowerResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setRadioPowerResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendDtmfResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms) { - rspInfo = info; - sendSmsResult = sms; - parent.notify(); - return Void(); + rspInfo = info; + sendSmsResult = sms; + parent.notify(); + return Void(); } -Return RadioResponse::sendSMSExpectMoreResponse( - const RadioResponseInfo& info, const SendSmsResult& sms) { - rspInfo = info; - sendSmsResult = sms; - parent.notify(); - return Void(); +Return RadioResponse::sendSMSExpectMoreResponse(const RadioResponseInfo& info, + const SendSmsResult& sms) { + rspInfo = info; + sendSmsResult = sms; + parent.notify(); + return Void(); } -Return RadioResponse::setupDataCallResponse( - const RadioResponseInfo& info, const SetupDataCallResult& /*dcResponse*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setupDataCallResponse(const RadioResponseInfo& info, + const SetupDataCallResult& /*dcResponse*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::iccIOForAppResponse(const RadioResponseInfo& info, const IccIoResult& iccIo) { - rspInfo = info; - this->iccIoResult = iccIo; - parent.notify(); - return Void(); + rspInfo = info; + this->iccIoResult = iccIo; + parent.notify(); + return Void(); } Return RadioResponse::sendUssdResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::cancelPendingUssdResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::cancelPendingUssdResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getClirResponse(const RadioResponseInfo& info, - int32_t /*n*/, int32_t /*m*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getClirResponse(const RadioResponseInfo& info, int32_t /*n*/, + int32_t /*m*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::setClirResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getCallForwardStatusResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& + const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*callForwardInfos*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCallForwardResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCallForwardResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getCallWaitingResponse( - const RadioResponseInfo& info, bool /*enable*/, int32_t /*serviceClass*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getCallWaitingResponse(const RadioResponseInfo& info, bool /*enable*/, + int32_t /*serviceClass*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCallWaitingResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCallWaitingResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::acknowledgeLastIncomingGsmSmsResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::acceptCallResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::deactivateDataCallResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::deactivateDataCallResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getFacilityLockForAppResponse( - const RadioResponseInfo& info, int32_t /*response*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getFacilityLockForAppResponse(const RadioResponseInfo& info, + int32_t /*response*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setFacilityLockForAppResponse( - const RadioResponseInfo& info, int32_t /*retry*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setFacilityLockForAppResponse(const RadioResponseInfo& info, + int32_t /*retry*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setBarringPasswordResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setBarringPasswordResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getNetworkSelectionModeResponse( - const RadioResponseInfo& info, bool /*manual*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getNetworkSelectionModeResponse(const RadioResponseInfo& info, + bool /*manual*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::setNetworkSelectionModeAutomaticResponse( const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setNetworkSelectionModeManualResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setNetworkSelectionModeManualResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getAvailableNetworksResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*networkInfos*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::startDtmfResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::stopDtmfResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getBasebandVersionResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*version*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*version*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::separateConnectionResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::separateConnectionResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::setMuteResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getMuteResponse(const RadioResponseInfo& info, - bool /*enable*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getMuteResponse(const RadioResponseInfo& info, bool /*enable*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getClipResponse(const RadioResponseInfo& info, - ClipStatus /*status*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getClipResponse(const RadioResponseInfo& info, ClipStatus /*status*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getDataCallListResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*dcResponse*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendOemRilRequestRawResponse( - const RadioResponseInfo& /*info*/, - const ::android::hardware::hidl_vec& /*data*/) { - return Void(); + const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*data*/) { + return Void(); } Return RadioResponse::sendOemRilRequestStringsResponse( const RadioResponseInfo& /*info*/, - const ::android::hardware::hidl_vec< - ::android::hardware::hidl_string>& /*data*/) { - return Void(); + const ::android::hardware::hidl_vec< ::android::hardware::hidl_string>& /*data*/) { + return Void(); } -Return RadioResponse::setSuppServiceNotificationsResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setSuppServiceNotificationsResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::writeSmsToSimResponse(const RadioResponseInfo& info, - int32_t index) { - rspInfo = info; - writeSmsToSimIndex = index; - parent.notify(); - return Void(); +Return RadioResponse::writeSmsToSimResponse(const RadioResponseInfo& info, int32_t index) { + rspInfo = info; + writeSmsToSimIndex = index; + parent.notify(); + return Void(); } -Return RadioResponse::deleteSmsOnSimResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::deleteSmsOnSimResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::setBandModeResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getAvailableBandModesResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*bandModes*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendEnvelopeResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*commandResponse*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*commandResponse*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::sendTerminalResponseToSimResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::sendTerminalResponseToSimResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::handleStkCallSetupRequestFromSimResponse( const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::explicitCallTransferResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::explicitCallTransferResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setPreferredNetworkTypeResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setPreferredNetworkTypeResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getPreferredNetworkTypeResponse( - const RadioResponseInfo& info, PreferredNetworkType /*nw_type*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getPreferredNetworkTypeResponse(const RadioResponseInfo& info, + PreferredNetworkType /*nw_type*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getNeighboringCidsResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*cells*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setLocationUpdatesResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setLocationUpdatesResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCdmaSubscriptionSourceResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCdmaRoamingPreferenceResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getCdmaRoamingPreferenceResponse( - const RadioResponseInfo& info, CdmaRoamingType /*type*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info, + CdmaRoamingType /*type*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::setTTYModeResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getTTYModeResponse(const RadioResponseInfo& info, - TtyMode /*mode*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getTTYModeResponse(const RadioResponseInfo& info, TtyMode /*mode*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setPreferredVoicePrivacyResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setPreferredVoicePrivacyResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getPreferredVoicePrivacyResponse( - const RadioResponseInfo& info, bool /*enable*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, + bool /*enable*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::sendCDMAFeatureCodeResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::sendCDMAFeatureCodeResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::sendBurstDtmfResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::sendBurstDtmfResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendCdmaSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms) { - rspInfo = info; - sendSmsResult = sms; - parent.notify(); - return Void(); + rspInfo = info; + sendSmsResult = sms; + parent.notify(); + return Void(); } -Return RadioResponse::acknowledgeLastIncomingCdmaSmsResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::acknowledgeLastIncomingCdmaSmsResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getGsmBroadcastConfigResponse( const RadioResponseInfo& info, - const ::android::hardware::hidl_vec< - GsmBroadcastSmsConfigInfo>& /*configs*/) { - rspInfo = info; - parent.notify(); - return Void(); + const ::android::hardware::hidl_vec& /*configs*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setGsmBroadcastConfigResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setGsmBroadcastConfigResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setGsmBroadcastActivationResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setGsmBroadcastActivationResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getCdmaBroadcastConfigResponse( const RadioResponseInfo& info, - const ::android::hardware::hidl_vec< - CdmaBroadcastSmsConfigInfo>& /*configs*/) { - rspInfo = info; - parent.notify(); - return Void(); + const ::android::hardware::hidl_vec& /*configs*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCdmaBroadcastConfigResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCdmaBroadcastConfigResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCdmaBroadcastActivationResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCdmaBroadcastActivationResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getCDMASubscriptionResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*mdn*/, + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*mdn*/, const ::android::hardware::hidl_string& /*hSid*/, const ::android::hardware::hidl_string& /*hNid*/, const ::android::hardware::hidl_string& /*min*/, const ::android::hardware::hidl_string& /*prl*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::writeSmsToRuimResponse( - const RadioResponseInfo& info, uint32_t index) { - rspInfo = info; - writeSmsToRuimIndex = index; - parent.notify(); - return Void(); +Return RadioResponse::writeSmsToRuimResponse(const RadioResponseInfo& info, uint32_t index) { + rspInfo = info; + writeSmsToRuimIndex = index; + parent.notify(); + return Void(); } -Return RadioResponse::deleteSmsOnRuimResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::deleteSmsOnRuimResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getDeviceIdentityResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*imei*/, + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*imei*/, const ::android::hardware::hidl_string& /*imeisv*/, const ::android::hardware::hidl_string& /*esn*/, const ::android::hardware::hidl_string& /*meid*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::exitEmergencyCallbackModeResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::exitEmergencyCallbackModeResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getSmscAddressResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& smsc) { - rspInfo = info; - smscAddress = smsc; - parent.notify(); - return Void(); +Return RadioResponse::getSmscAddressResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& smsc) { + rspInfo = info; + smscAddress = smsc; + parent.notify(); + return Void(); } -Return RadioResponse::setSmscAddressResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setSmscAddressResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::reportSmsMemoryStatusResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::reportSmsMemoryStatusResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::reportStkServiceIsRunningResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::reportStkServiceIsRunningResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getCdmaSubscriptionSourceResponse( - const RadioResponseInfo& info, CdmaSubscriptionSource /*source*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info, + CdmaSubscriptionSource /*source*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::requestIsimAuthenticationResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*response*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*response*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::acknowledgeIncomingGsmSmsWithPduResponse( const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::sendEnvelopeWithStatusResponse( - const RadioResponseInfo& info, const IccIoResult& /*iccIo*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::sendEnvelopeWithStatusResponse(const RadioResponseInfo& info, + const IccIoResult& /*iccIo*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getVoiceRadioTechnologyResponse( - const RadioResponseInfo& info, RadioTechnology /*rat*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getVoiceRadioTechnologyResponse(const RadioResponseInfo& info, + RadioTechnology /*rat*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getCellInfoListResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& /*cellInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); + const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*cellInfo*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setCellInfoListRateResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setCellInfoListRateResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setInitialAttachApnResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setInitialAttachApnResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getImsRegistrationStateResponse( - const RadioResponseInfo& info, bool /*isRegistered*/, - RadioTechnologyFamily /*ratFamily*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getImsRegistrationStateResponse(const RadioResponseInfo& info, + bool /*isRegistered*/, + RadioTechnologyFamily /*ratFamily*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::sendImsSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms) { - rspInfo = info; - sendSmsResult = sms; - parent.notify(); - return Void(); + rspInfo = info; + sendSmsResult = sms; + parent.notify(); + return Void(); } -Return RadioResponse::iccTransmitApduBasicChannelResponse( - const RadioResponseInfo& info, const IccIoResult& result) { - rspInfo = info; - this->iccIoResult = result; - parent.notify(); - return Void(); +Return RadioResponse::iccTransmitApduBasicChannelResponse(const RadioResponseInfo& info, + const IccIoResult& result) { + rspInfo = info; + this->iccIoResult = result; + parent.notify(); + return Void(); } Return RadioResponse::iccOpenLogicalChannelResponse( const RadioResponseInfo& info, int32_t channelId, const ::android::hardware::hidl_vec& /*selectResponse*/) { - rspInfo = info; - this->channelId = channelId; - parent.notify(); - return Void(); + rspInfo = info; + this->channelId = channelId; + parent.notify(); + return Void(); } -Return RadioResponse::iccCloseLogicalChannelResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::iccCloseLogicalChannelResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::iccTransmitApduLogicalChannelResponse( - const RadioResponseInfo& info, const IccIoResult& result) { - rspInfo = info; - this->iccIoResult = result; - parent.notify(); - return Void(); +Return RadioResponse::iccTransmitApduLogicalChannelResponse(const RadioResponseInfo& info, + const IccIoResult& result) { + rspInfo = info; + this->iccIoResult = result; + parent.notify(); + return Void(); } -Return RadioResponse::nvReadItemResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_string& /*result*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::nvReadItemResponse(const RadioResponseInfo& info, + const ::android::hardware::hidl_string& /*result*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::nvWriteItemResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::nvWriteCdmaPrlResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::nvWriteCdmaPrlResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::nvResetConfigResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::nvResetConfigResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setUiccSubscriptionResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setUiccSubscriptionResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setDataAllowedResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setDataAllowedResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getHardwareConfigResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec& /*config*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::requestIccSimAuthenticationResponse( - const RadioResponseInfo& info, const IccIoResult& result) { - rspInfo = info; - this->iccIoResult = result; - parent.notify(); - return Void(); +Return RadioResponse::requestIccSimAuthenticationResponse(const RadioResponseInfo& info, + const IccIoResult& result) { + rspInfo = info; + this->iccIoResult = result; + parent.notify(); + return Void(); } -Return RadioResponse::setDataProfileResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setDataProfileResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::requestShutdownResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::requestShutdownResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getRadioCapabilityResponse( - const RadioResponseInfo& info, const RadioCapability& /*rc*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getRadioCapabilityResponse(const RadioResponseInfo& info, + const RadioCapability& /*rc*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setRadioCapabilityResponse( - const RadioResponseInfo& info, const RadioCapability& /*rc*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setRadioCapabilityResponse(const RadioResponseInfo& info, + const RadioCapability& /*rc*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::startLceServiceResponse( - const RadioResponseInfo& info, const LceStatusInfo& /*statusInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::startLceServiceResponse(const RadioResponseInfo& info, + const LceStatusInfo& /*statusInfo*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::stopLceServiceResponse( - const RadioResponseInfo& info, const LceStatusInfo& /*statusInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::stopLceServiceResponse(const RadioResponseInfo& info, + const LceStatusInfo& /*statusInfo*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::pullLceDataResponse( - const RadioResponseInfo& info, const LceDataInfo& /*lceInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::pullLceDataResponse(const RadioResponseInfo& info, + const LceDataInfo& /*lceInfo*/) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::getModemActivityInfoResponse( const RadioResponseInfo& info, const ActivityStatsInfo& /*activityInfo*/) { - rspInfo = info; - parent.notify(); - return Void(); + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setAllowedCarriersResponse( - const RadioResponseInfo& info, int32_t /*numAllowed*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setAllowedCarriersResponse(const RadioResponseInfo& info, + int32_t /*numAllowed*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::getAllowedCarriersResponse( - const RadioResponseInfo& info, bool /*allAllowed*/, - const CarrierRestrictions& /*carriers*/) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::getAllowedCarriersResponse(const RadioResponseInfo& info, + bool /*allAllowed*/, + const CarrierRestrictions& /*carriers*/) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::sendDeviceStateResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::sendDeviceStateResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setIndicationFilterResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setIndicationFilterResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } -Return RadioResponse::setSimCardPowerResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent.notify(); - return Void(); +Return RadioResponse::setSimCardPowerResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent.notify(); + return Void(); } Return RadioResponse::acknowledgeRequest(int32_t /*serial*/) { - return Void(); + return Void(); } diff --git a/radio/1.0/vts/functional/sap_callback.cpp b/radio/1.0/vts/functional/sap_callback.cpp index 3a06ecd392..fdcc15c374 100644 --- a/radio/1.0/vts/functional/sap_callback.cpp +++ b/radio/1.0/vts/functional/sap_callback.cpp @@ -18,78 +18,74 @@ SapCallback::SapCallback(SapHidlTest& parent) : parent(parent) {} -Return SapCallback::connectResponse(int32_t token, - SapConnectRsp /*sapConnectRsp*/, +Return SapCallback::connectResponse(int32_t token, SapConnectRsp /*sapConnectRsp*/, int32_t /*maxMsgSize*/) { - sapResponseToken = token; - parent.notify(); - return Void(); + sapResponseToken = token; + parent.notify(); + return Void(); } Return SapCallback::disconnectResponse(int32_t token) { - sapResponseToken = token; - parent.notify(); - return Void(); + sapResponseToken = token; + parent.notify(); + return Void(); } -Return SapCallback::disconnectIndication( - int32_t /*token*/, SapDisconnectType /*disconnectType*/) { - return Void(); +Return SapCallback::disconnectIndication(int32_t /*token*/, + SapDisconnectType /*disconnectType*/) { + return Void(); } -Return SapCallback::apduResponse( - int32_t token, SapResultCode resultCode, - const ::android::hardware::hidl_vec& /*apduRsp*/) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); +Return SapCallback::apduResponse(int32_t token, SapResultCode resultCode, + const ::android::hardware::hidl_vec& /*apduRsp*/) { + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } Return SapCallback::transferAtrResponse( int32_t token, SapResultCode resultCode, const ::android::hardware::hidl_vec& /*atr*/) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } -Return SapCallback::powerResponse(int32_t token, - SapResultCode resultCode) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); +Return SapCallback::powerResponse(int32_t token, SapResultCode resultCode) { + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } -Return SapCallback::resetSimResponse(int32_t token, - SapResultCode resultCode) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); +Return SapCallback::resetSimResponse(int32_t token, SapResultCode resultCode) { + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } -Return SapCallback::statusIndication(int32_t /*token*/, - SapStatus /*status*/) { - return Void(); +Return SapCallback::statusIndication(int32_t /*token*/, SapStatus /*status*/) { + return Void(); } -Return SapCallback::transferCardReaderStatusResponse( - int32_t token, SapResultCode resultCode, int32_t /*cardReaderStatus*/) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); +Return SapCallback::transferCardReaderStatusResponse(int32_t token, SapResultCode resultCode, + int32_t /*cardReaderStatus*/) { + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } -Return SapCallback::errorResponse(int32_t /*token*/) { return Void(); } - -Return SapCallback::transferProtocolResponse(int32_t token, - SapResultCode resultCode) { - sapResponseToken = token; - sapResultCode = resultCode; - parent.notify(); - return Void(); +Return SapCallback::errorResponse(int32_t /*token*/) { + return Void(); +} + +Return SapCallback::transferProtocolResponse(int32_t token, SapResultCode resultCode) { + sapResponseToken = token; + sapResultCode = resultCode; + parent.notify(); + return Void(); } diff --git a/radio/1.0/vts/functional/sap_hidl_hal_api.cpp b/radio/1.0/vts/functional/sap_hidl_hal_api.cpp index 682230c89a..bb614879af 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_api.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_api.cpp @@ -20,112 +20,117 @@ * Test ISap.connectReq() for the response returned. */ TEST_F(SapHidlTest, connectReq) { - int32_t token = 0; - int32_t maxMsgSize = 100; + int32_t token = GetRandomSerialNumber(); + int32_t maxMsgSize = 100; - sap->connectReq(++token, maxMsgSize); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->connectReq(token, maxMsgSize); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); } /* * Test IRadio.disconnectReq() for the response returned */ TEST_F(SapHidlTest, disconnectReq) { - int32_t token = 0; + int32_t token = GetRandomSerialNumber(); - sap->disconnectReq(++token); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->disconnectReq(token); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); } /* * Test IRadio.apduReq() for the response returned. */ TEST_F(SapHidlTest, apduReq) { - int32_t token = 0; - SapApduType sapApduType = SapApduType::APDU; - android::hardware::hidl_vec command = {}; + int32_t token = GetRandomSerialNumber(); + SapApduType sapApduType = SapApduType::APDU; + android::hardware::hidl_vec command = {}; - sap->apduReq(++token, sapApduType, command); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->apduReq(token, sapApduType, command); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - ASSERT_TRUE(SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || - SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || - SapResultCode::CARD_REMOVED == sapCb->sapResultCode); + ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || + SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || + SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || + SapResultCode::CARD_REMOVED == sapCb->sapResultCode); } /* * Test IRadio.transferAtrReq() for the response returned. */ TEST_F(SapHidlTest, transferAtrReq) { - int32_t token = 0; + int32_t token = GetRandomSerialNumber(); - sap->transferAtrReq(++token); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->transferAtrReq(token); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - ASSERT_TRUE(SapResultCode::DATA_NOT_AVAILABLE == sapCb->sapResultCode || - SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || - SapResultCode::CARD_REMOVED == sapCb->sapResultCode); + ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || + SapResultCode::DATA_NOT_AVAILABLE == sapCb->sapResultCode || + SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || + SapResultCode::CARD_REMOVED == sapCb->sapResultCode); } /* * Test IRadio.powerReq() for the response returned. */ TEST_F(SapHidlTest, powerReq) { - int32_t token = 0; - bool state = true; + int32_t token = GetRandomSerialNumber(); + bool state = true; - sap->powerReq(++token, state); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->powerReq(token, state); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - ASSERT_TRUE(SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || - SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || - SapResultCode::CARD_REMOVED == sapCb->sapResultCode || - SapResultCode::CARD_ALREADY_POWERED_ON == sapCb->sapResultCode); + ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || + SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || + SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || + SapResultCode::CARD_REMOVED == sapCb->sapResultCode || + SapResultCode::CARD_ALREADY_POWERED_ON == sapCb->sapResultCode); } /* * Test IRadio.resetSimReq() for the response returned. */ TEST_F(SapHidlTest, resetSimReq) { - int32_t token = 0; + int32_t token = GetRandomSerialNumber(); - sap->resetSimReq(++token); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->resetSimReq(token); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - ASSERT_TRUE(SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || - SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || - SapResultCode::CARD_REMOVED == sapCb->sapResultCode); + ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || + SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode || + SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode || + SapResultCode::CARD_REMOVED == sapCb->sapResultCode); } /* * Test IRadio.transferCardReaderStatusReq() for the response returned. */ TEST_F(SapHidlTest, transferCardReaderStatusReq) { - int32_t token = 0; + int32_t token = GetRandomSerialNumber(); - sap->transferCardReaderStatusReq(++token); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->transferCardReaderStatusReq(token); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - EXPECT_EQ(SapResultCode::DATA_NOT_AVAILABLE, sapCb->sapResultCode); + ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || + SapResultCode::DATA_NOT_AVAILABLE == sapCb->sapResultCode); } /* * Test IRadio.setTransferProtocolReq() for the response returned. */ TEST_F(SapHidlTest, setTransferProtocolReq) { - int32_t token = 0; - SapTransferProtocol sapTransferProtocol = SapTransferProtocol::T0; + int32_t token = GetRandomSerialNumber(); + SapTransferProtocol sapTransferProtocol = SapTransferProtocol::T0; - sap->setTransferProtocolReq(++token, sapTransferProtocol); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(sapCb->sapResponseToken, token); + sap->setTransferProtocolReq(token, sapTransferProtocol); + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(sapCb->sapResponseToken, token); - EXPECT_EQ(SapResultCode::NOT_SUPPORTED, sapCb->sapResultCode); + EXPECT_EQ(SapResultCode::NOT_SUPPORTED, sapCb->sapResultCode); } diff --git a/radio/1.0/vts/functional/sap_hidl_hal_test.cpp b/radio/1.0/vts/functional/sap_hidl_hal_test.cpp index 02accef2e5..fc8cb2af51 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_test.cpp @@ -17,37 +17,36 @@ #include void SapHidlTest::SetUp() { - sap = ::testing::VtsHalHidlTargetTestBase::getService( - hidl_string(SAP_SERVICE_NAME)); - ASSERT_NE(sap, nullptr); + sap = ::testing::VtsHalHidlTargetTestBase::getService(hidl_string(SAP_SERVICE_NAME)); + ASSERT_NE(sap, nullptr); - sapCb = new SapCallback(*this); - ASSERT_NE(sapCb, nullptr); + sapCb = new SapCallback(*this); + ASSERT_NE(sapCb, nullptr); - count = 0; + count = 0; - sap->setCallback(sapCb); + sap->setCallback(sapCb); } void SapHidlTest::TearDown() {} void SapHidlTest::notify() { - std::unique_lock lock(mtx); - count++; - cv.notify_one(); + std::unique_lock lock(mtx); + count++; + cv.notify_one(); } std::cv_status SapHidlTest::wait() { - std::unique_lock lock(mtx); + std::unique_lock lock(mtx); - std::cv_status status = std::cv_status::no_timeout; - auto now = std::chrono::system_clock::now(); - while (count == 0) { - status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD)); - if (status == std::cv_status::timeout) { - return status; + std::cv_status status = std::cv_status::no_timeout; + auto now = std::chrono::system_clock::now(); + while (count == 0) { + status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD)); + if (status == std::cv_status::timeout) { + return status; + } } - } - count--; - return status; -} + count--; + return status; +} \ No newline at end of file diff --git a/radio/1.0/vts/functional/sap_hidl_hal_utils.h b/radio/1.0/vts/functional/sap_hidl_hal_utils.h index 38fb003026..fe93a4dbbf 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/sap_hidl_hal_utils.h @@ -25,6 +25,8 @@ #include #include +#include + using namespace ::android::hardware::radio::V1_0; using ::android::hardware::hidl_string; @@ -40,77 +42,71 @@ class SapHidlTest; /* Callback class for sap response */ class SapCallback : public ISapCallback { - private: - SapHidlTest& parent; + private: + SapHidlTest& parent; - public: - SapResultCode sapResultCode; - int32_t sapResponseToken; + public: + SapResultCode sapResultCode; + int32_t sapResponseToken; - SapCallback(SapHidlTest& parent); + SapCallback(SapHidlTest& parent); - virtual ~SapCallback() = default; + virtual ~SapCallback() = default; - Return connectResponse(int32_t token, SapConnectRsp sapConnectRsp, - int32_t maxMsgSize); + Return connectResponse(int32_t token, SapConnectRsp sapConnectRsp, int32_t maxMsgSize); - Return disconnectResponse(int32_t token); + Return disconnectResponse(int32_t token); - Return disconnectIndication(int32_t token, - SapDisconnectType disconnectType); + Return disconnectIndication(int32_t token, SapDisconnectType disconnectType); - Return apduResponse( - int32_t token, SapResultCode resultCode, - const ::android::hardware::hidl_vec& apduRsp); + Return apduResponse(int32_t token, SapResultCode resultCode, + const ::android::hardware::hidl_vec& apduRsp); - Return transferAtrResponse( - int32_t token, SapResultCode resultCode, - const ::android::hardware::hidl_vec& atr); + Return transferAtrResponse(int32_t token, SapResultCode resultCode, + const ::android::hardware::hidl_vec& atr); - Return powerResponse(int32_t token, SapResultCode resultCode); + Return powerResponse(int32_t token, SapResultCode resultCode); - Return resetSimResponse(int32_t token, SapResultCode resultCode); + Return resetSimResponse(int32_t token, SapResultCode resultCode); - Return statusIndication(int32_t token, SapStatus status); + Return statusIndication(int32_t token, SapStatus status); - Return transferCardReaderStatusResponse(int32_t token, - SapResultCode resultCode, - int32_t cardReaderStatus); + Return transferCardReaderStatusResponse(int32_t token, SapResultCode resultCode, + int32_t cardReaderStatus); - Return errorResponse(int32_t token); + Return errorResponse(int32_t token); - Return transferProtocolResponse(int32_t token, - SapResultCode resultCode); + Return transferProtocolResponse(int32_t token, SapResultCode resultCode); }; // The main test class for Sap HIDL. class SapHidlTest : public ::testing::VtsHalHidlTargetTestBase { - private: - std::mutex mtx; - std::condition_variable cv; - int count; + private: + std::mutex mtx; + std::condition_variable cv; + int count; - public: - virtual void SetUp() override; + public: + virtual void SetUp() override; - virtual void TearDown() override; + virtual void TearDown() override; - /* Used as a mechanism to inform the test about data/event callback */ - void notify(); + /* Used as a mechanism to inform the test about data/event callback */ + void notify(); - /* Test code calls this function to wait for response */ - std::cv_status wait(); + /* Test code calls this function to wait for response */ + std::cv_status wait(); - /* Sap service */ - sp sap; + /* Sap service */ + sp sap; - /* Sap Callback object */ - sp sapCb; + /* Sap Callback object */ + sp sapCb; }; // A class for test environment setup class SapHidlEnvironment : public ::testing::Environment { - public: - virtual void SetUp() {} - virtual void TearDown() {} + public: + virtual void SetUp() {} + virtual void TearDown() {} }; diff --git a/radio/1.0/vts/functional/vts_test_util.cpp b/radio/1.0/vts/functional/vts_test_util.cpp new file mode 100644 index 0000000000..c6d1f9f137 --- /dev/null +++ b/radio/1.0/vts/functional/vts_test_util.cpp @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +using namespace std; + +int GetRandomSerialNumber() { + return rand(); +} \ No newline at end of file diff --git a/radio/1.0/vts/functional/vts_test_util.h b/radio/1.0/vts/functional/vts_test_util.h new file mode 100644 index 0000000000..939013f49f --- /dev/null +++ b/radio/1.0/vts/functional/vts_test_util.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +int GetRandomSerialNumber(); \ No newline at end of file