From fffbdfa1eb984b7596cbeaa64569f7f495e20f89 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Tue, 23 Jun 2020 16:11:48 -0700 Subject: [PATCH] Override gtest timeout and add logging Note that this just increases the gtest time to match our highest wait times. Each test still has wait times fitted for the expected length of that test. Bug: 159289514 Test: atest VtsHalRadioV1_0TargetTest Change-Id: I0825305258bae20ea6e13e9b9a65ce30b7153611 --- .../radio_hidl_hal_cell_broadcast.cpp | 13 +++ .../vts/functional/radio_hidl_hal_data.cpp | 15 +++ .../1.0/vts/functional/radio_hidl_hal_icc.cpp | 31 +++++++ .../vts/functional/radio_hidl_hal_misc.cpp | 91 +++++++++++++++++++ .../1.0/vts/functional/radio_hidl_hal_sms.cpp | 29 ++++++ .../1.0/vts/functional/radio_hidl_hal_stk.cpp | 11 +++ .../vts/functional/radio_hidl_hal_test.cpp | 4 +- .../vts/functional/radio_hidl_hal_voice.cpp | 51 +++++++++++ radio/1.0/vts/functional/sap_hidl_hal_api.cpp | 17 ++++ .../functional/vts_hal_radio_target_test.xml | 1 + radio/1.1/vts/functional/AndroidTest.xml | 1 + .../1.2/vts/functional/radio_hidl_hal_api.cpp | 2 +- 12 files changed, 264 insertions(+), 2 deletions(-) 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 125ea0cce6..8e6cf860af 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 @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include using namespace ::android::hardware::radio::V1_0; @@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.setGsmBroadcastConfig() for the response returned. */ TEST_P(RadioHidlTest, setGsmBroadcastConfig) { + LOG(DEBUG) << "setGsmBroadcastConfig"; serial = GetRandomSerialNumber(); // Create GsmBroadcastSmsConfigInfo #1 @@ -79,12 +81,14 @@ TEST_P(RadioHidlTest, setGsmBroadcastConfig) { RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setGsmBroadcastConfig finished"; } /* * Test IRadio.getGsmBroadcastConfig() for the response returned. */ TEST_P(RadioHidlTest, getGsmBroadcastConfig) { + LOG(DEBUG) << "getGsmBroadcastConfig"; serial = GetRandomSerialNumber(); radio->getGsmBroadcastConfig(serial); @@ -99,12 +103,14 @@ TEST_P(RadioHidlTest, getGsmBroadcastConfig) { {RadioError::NONE, RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getGsmBroadcastConfig finished"; } /* * Test IRadio.setCdmaBroadcastConfig() for the response returned. */ TEST_P(RadioHidlTest, setCdmaBroadcastConfig) { + LOG(DEBUG) << "setCdmaBroadcastConfig"; serial = GetRandomSerialNumber(); CdmaBroadcastSmsConfigInfo cbSmsConfig; @@ -126,12 +132,14 @@ TEST_P(RadioHidlTest, setCdmaBroadcastConfig) { {RadioError::NONE, RadioError::INVALID_MODEM_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setCdmaBroadcastConfig finished"; } /* * Test IRadio.getCdmaBroadcastConfig() for the response returned. */ TEST_P(RadioHidlTest, getCdmaBroadcastConfig) { + LOG(DEBUG) << "getCdmaBroadcastConfig"; serial = GetRandomSerialNumber(); radio->getCdmaBroadcastConfig(serial); @@ -144,12 +152,14 @@ TEST_P(RadioHidlTest, getCdmaBroadcastConfig) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getCdmaBroadcastConfig finished"; } /* * Test IRadio.setCdmaBroadcastActivation() for the response returned. */ TEST_P(RadioHidlTest, setCdmaBroadcastActivation) { + LOG(DEBUG) << "setCdmaBroadcastActivation"; serial = GetRandomSerialNumber(); bool activate = false; @@ -164,12 +174,14 @@ TEST_P(RadioHidlTest, setCdmaBroadcastActivation) { {RadioError::NONE, RadioError::INVALID_ARGUMENTS}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setCdmaBroadcastActivation finished"; } /* * Test IRadio.setGsmBroadcastActivation() for the response returned. */ TEST_P(RadioHidlTest, setGsmBroadcastActivation) { + LOG(DEBUG) << "setGsmBroadcastActivation"; serial = GetRandomSerialNumber(); bool activate = false; @@ -186,4 +198,5 @@ TEST_P(RadioHidlTest, setGsmBroadcastActivation) { RadioError::INVALID_STATE, RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setGsmBroadcastActivation finished"; } 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 d937d74403..e3ee9d4ff3 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include using namespace ::android::hardware::radio::V1_0; @@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.getDataRegistrationState() for the response returned. */ TEST_P(RadioHidlTest, getDataRegistrationState) { + LOG(DEBUG) << "getDataRegistrationState"; serial = GetRandomSerialNumber(); radio->getDataRegistrationState(serial); @@ -94,12 +96,14 @@ TEST_P(RadioHidlTest, getDataRegistrationState) { } } } + LOG(DEBUG) << "getDataRegistrationState finished"; } /* * Test IRadio.setupDataCall() for the response returned. */ TEST_P(RadioHidlTest, setupDataCall) { + LOG(DEBUG) << "setupDataCall"; serial = GetRandomSerialNumber(); RadioTechnology radioTechnology = RadioTechnology::LTE; @@ -142,12 +146,14 @@ TEST_P(RadioHidlTest, setupDataCall) { RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}, CHECK_OEM_ERROR)); } + LOG(DEBUG) << "setupDataCall finished"; } /* * Test IRadio.deactivateDataCall() for the response returned. */ TEST_P(RadioHidlTest, deactivateDataCall) { + LOG(DEBUG) << "deactivateDataCall"; serial = GetRandomSerialNumber(); int cid = 1; bool reasonRadioShutDown = false; @@ -164,12 +170,14 @@ TEST_P(RadioHidlTest, deactivateDataCall) { RadioError::SIM_ABSENT, RadioError::INVALID_CALL_ID}, CHECK_OEM_ERROR)); } + LOG(DEBUG) << "deactivateDataCall finished"; } /* * Test IRadio.getDataCallList() for the response returned. */ TEST_P(RadioHidlTest, getDataCallList) { + LOG(DEBUG) << "getDataCallList"; serial = GetRandomSerialNumber(); radio->getDataCallList(serial); @@ -183,12 +191,14 @@ TEST_P(RadioHidlTest, getDataCallList) { radioRsp->rspInfo.error, {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "getDataCallList finished"; } /* * Test IRadio.setInitialAttachApn() for the response returned. */ TEST_P(RadioHidlTest, setInitialAttachApn) { + LOG(DEBUG) << "setInitialAttachApn"; serial = GetRandomSerialNumber(); DataProfileInfo dataProfileInfo; @@ -226,12 +236,14 @@ TEST_P(RadioHidlTest, setInitialAttachApn) { RadioError::SUBSCRIPTION_NOT_AVAILABLE}, CHECK_OEM_ERROR)); } + LOG(DEBUG) << "setInitialAttachApn finished"; } /* * Test IRadio.setDataAllowed() for the response returned. */ TEST_P(RadioHidlTest, setDataAllowed) { + LOG(DEBUG) << "setDataAllowed"; serial = GetRandomSerialNumber(); bool allow = true; @@ -244,12 +256,14 @@ TEST_P(RadioHidlTest, setDataAllowed) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "setDataAllowed finished"; } /* * Test IRadio.setDataProfile() for the response returned. */ TEST_P(RadioHidlTest, setDataProfile) { + LOG(DEBUG) << "setDataProfile"; serial = GetRandomSerialNumber(); // Create a dataProfileInfo @@ -289,4 +303,5 @@ TEST_P(RadioHidlTest, setDataProfile) { {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setDataProfile finished"; } 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 9568524f4f..8a977a91e1 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -14,22 +14,26 @@ * limitations under the License. */ +#include #include /* * Test IRadio.getIccCardStatus() for the response returned. */ TEST_P(RadioHidlTest, getIccCardStatus) { + LOG(DEBUG) << "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); + LOG(DEBUG) << "getIccCardStatus finished"; } /* * Test IRadio.supplyIccPinForApp() for the response returned */ TEST_P(RadioHidlTest, supplyIccPinForApp) { + LOG(DEBUG) << "supplyIccPinForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -49,12 +53,14 @@ TEST_P(RadioHidlTest, supplyIccPinForApp) { {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED})); } } + LOG(DEBUG) << "supplyIccPinForApp finished"; } /* * Test IRadio.supplyIccPukForApp() for the response returned. */ TEST_P(RadioHidlTest, supplyIccPukForApp) { + LOG(DEBUG) << "supplyIccPukForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -73,12 +79,14 @@ TEST_P(RadioHidlTest, supplyIccPukForApp) { RadioError::INVALID_SIM_STATE})); } } + LOG(DEBUG) << "supplyIccPukForApp finished"; } /* * Test IRadio.supplyIccPin2ForApp() for the response returned. */ TEST_P(RadioHidlTest, supplyIccPin2ForApp) { + LOG(DEBUG) << "supplyIccPin2ForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -99,12 +107,14 @@ TEST_P(RadioHidlTest, supplyIccPin2ForApp) { RadioError::SIM_PUK2})); } } + LOG(DEBUG) << "supplyIccPin2ForApp finished"; } /* * Test IRadio.supplyIccPuk2ForApp() for the response returned. */ TEST_P(RadioHidlTest, supplyIccPuk2ForApp) { + LOG(DEBUG) << "supplyIccPuk2ForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -123,12 +133,14 @@ TEST_P(RadioHidlTest, supplyIccPuk2ForApp) { RadioError::INVALID_SIM_STATE})); } } + LOG(DEBUG) << "supplyIccPuk2ForApp finished"; } /* * Test IRadio.changeIccPinForApp() for the response returned. */ TEST_P(RadioHidlTest, changeIccPinForApp) { + LOG(DEBUG) << "changeIccPinForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -148,12 +160,14 @@ TEST_P(RadioHidlTest, changeIccPinForApp) { {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED})); } } + LOG(DEBUG) << "changeIccPinForApp finished"; } /* * Test IRadio.changeIccPin2ForApp() for the response returned. */ TEST_P(RadioHidlTest, changeIccPin2ForApp) { + LOG(DEBUG) << "changeIccPin2ForApp"; serial = GetRandomSerialNumber(); // Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and @@ -174,6 +188,7 @@ TEST_P(RadioHidlTest, changeIccPin2ForApp) { RadioError::SIM_PUK2})); } } + LOG(DEBUG) << "changeIccPin2ForApp finished"; } /* @@ -182,6 +197,7 @@ TEST_P(RadioHidlTest, changeIccPin2ForApp) { * Test IRadio.getImsiForApp() for the response returned. */ TEST_P(RadioHidlTest, DISABLED_getImsiForApp) { + LOG(DEBUG) << "DISABLED_getImsiForApp"; serial = GetRandomSerialNumber(); // Check success returned while getting imsi for 3GPP and 3GPP2 apps only @@ -205,12 +221,14 @@ TEST_P(RadioHidlTest, DISABLED_getImsiForApp) { } } } + LOG(DEBUG) << "DISABLED_getImsiForApp finished"; } /* * Test IRadio.iccIOForApp() for the response returned. */ TEST_P(RadioHidlTest, iccIOForApp) { + LOG(DEBUG) << "iccIOForApp"; serial = GetRandomSerialNumber(); for (int i = 0; i < (int)cardStatus.applications.size(); i++) { @@ -230,12 +248,14 @@ TEST_P(RadioHidlTest, iccIOForApp) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); EXPECT_EQ(serial, radioRsp->rspInfo.serial); } + LOG(DEBUG) << "iccIOForApp finished"; } /* * Test IRadio.iccTransmitApduBasicChannel() for the response returned. */ TEST_P(RadioHidlTest, iccTransmitApduBasicChannel) { + LOG(DEBUG) << "iccTransmitApduBasicChannel"; serial = GetRandomSerialNumber(); SimApdu msg; memset(&msg, 0, sizeof(msg)); @@ -247,12 +267,14 @@ TEST_P(RadioHidlTest, iccTransmitApduBasicChannel) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); // TODO(sanketpadawe): Add test for error code + LOG(DEBUG) << "iccTransmitApduBasicChannel finished"; } /* * Test IRadio.iccOpenLogicalChannel() for the response returned. */ TEST_P(RadioHidlTest, iccOpenLogicalChannel) { + LOG(DEBUG) << "iccOpenLogicalChannel"; serial = GetRandomSerialNumber(); int p2 = 0x04; // Specified in ISO 7816-4 clause 7.1.1 0x04 means that FCP template is requested. @@ -262,12 +284,14 @@ TEST_P(RadioHidlTest, iccOpenLogicalChannel) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); } + LOG(DEBUG) << "iccOpenLogicalChannel finished"; } /* * Test IRadio.iccCloseLogicalChannel() for the response returned. */ TEST_P(RadioHidlTest, iccCloseLogicalChannel) { + LOG(DEBUG) << "iccCloseLogicalChannel"; serial = GetRandomSerialNumber(); // Try closing invalid channel and check INVALID_ARGUMENTS returned as error radio->iccCloseLogicalChannel(serial, 0); @@ -276,12 +300,14 @@ TEST_P(RadioHidlTest, iccCloseLogicalChannel) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error); + LOG(DEBUG) << "iccCloseLogicalChannel finished"; } /* * Test IRadio.iccTransmitApduLogicalChannel() for the response returned. */ TEST_P(RadioHidlTest, iccTransmitApduLogicalChannel) { + LOG(DEBUG) << "iccTransmitApduLogicalChannel"; serial = GetRandomSerialNumber(); SimApdu msg; memset(&msg, 0, sizeof(msg)); @@ -293,12 +319,14 @@ TEST_P(RadioHidlTest, iccTransmitApduLogicalChannel) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); // TODO(sanketpadawe): Add test for error code + LOG(DEBUG) << "iccTransmitApduLogicalChannel finished"; } /* * Test IRadio.requestIccSimAuthentication() for the response returned. */ TEST_P(RadioHidlTest, requestIccSimAuthentication) { + LOG(DEBUG) << "requestIccSimAuthentication"; serial = GetRandomSerialNumber(); // Pass wrong challenge string and check RadioError::INVALID_ARGUMENTS @@ -312,12 +340,14 @@ TEST_P(RadioHidlTest, requestIccSimAuthentication) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "requestIccSimAuthentication finished"; } /* * Test IRadio.supplyNetworkDepersonalization() for the response returned. */ TEST_P(RadioHidlTest, supplyNetworkDepersonalization) { + LOG(DEBUG) << "supplyNetworkDepersonalization"; serial = GetRandomSerialNumber(); radio->supplyNetworkDepersonalization(serial, hidl_string("test")); @@ -332,4 +362,5 @@ TEST_P(RadioHidlTest, supplyNetworkDepersonalization) { RadioError::INVALID_SIM_STATE, RadioError::MODEM_ERR, RadioError::NO_MEMORY, RadioError::PASSWORD_INCORRECT, RadioError::SIM_ABSENT, RadioError::SYSTEM_ERR})); } + LOG(DEBUG) << "supplyNetworkDepersonalization finished"; } 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 7228fb086b..3f964732f6 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -14,12 +14,14 @@ * limitations under the License. */ +#include #include /* * Test IRadio.getSignalStrength() for the response returned. */ TEST_P(RadioHidlTest, getSignalStrength) { + LOG(DEBUG) << "getSignalStrength"; serial = GetRandomSerialNumber(); radio->getSignalStrength(serial); @@ -30,12 +32,14 @@ TEST_P(RadioHidlTest, getSignalStrength) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getSignalStrength finished"; } /* * Test IRadio.getVoiceRegistrationState() for the response returned. */ TEST_P(RadioHidlTest, getVoiceRegistrationState) { + LOG(DEBUG) << "getVoiceRegistrationState"; serial = GetRandomSerialNumber(); radio->getVoiceRegistrationState(serial); @@ -46,12 +50,14 @@ TEST_P(RadioHidlTest, getVoiceRegistrationState) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getVoiceRegistrationState finished"; } /* * Test IRadio.getOperator() for the response returned. */ TEST_P(RadioHidlTest, getOperator) { + LOG(DEBUG) << "getOperator"; serial = GetRandomSerialNumber(); radio->getOperator(serial); @@ -62,12 +68,14 @@ TEST_P(RadioHidlTest, getOperator) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getOperator finished"; } /* * Test IRadio.setRadioPower() for the response returned. */ TEST_P(RadioHidlTest, setRadioPower) { + LOG(DEBUG) << "setRadioPower"; serial = GetRandomSerialNumber(); radio->setRadioPower(serial, 1); @@ -78,12 +86,14 @@ TEST_P(RadioHidlTest, setRadioPower) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "setRadioPower finished"; } /* * Test IRadio.getNetworkSelectionMode() for the response returned. */ TEST_P(RadioHidlTest, getNetworkSelectionMode) { + LOG(DEBUG) << "getNetworkSelectionMode"; serial = GetRandomSerialNumber(); radio->getNetworkSelectionMode(serial); @@ -94,12 +104,14 @@ TEST_P(RadioHidlTest, getNetworkSelectionMode) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getNetworkSelectionMode finished"; } /* * Test IRadio.setNetworkSelectionModeAutomatic() for the response returned. */ TEST_P(RadioHidlTest, setNetworkSelectionModeAutomatic) { + LOG(DEBUG) << "setNetworkSelectionModeAutomatic"; serial = GetRandomSerialNumber(); radio->setNetworkSelectionModeAutomatic(serial); @@ -113,12 +125,14 @@ TEST_P(RadioHidlTest, setNetworkSelectionModeAutomatic) { {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setNetworkSelectionModeAutomatic finished"; } /* * Test IRadio.setNetworkSelectionModeManual() for the response returned. */ TEST_P(RadioHidlTest, setNetworkSelectionModeManual) { + LOG(DEBUG) << "setNetworkSelectionModeManual"; serial = GetRandomSerialNumber(); radio->setNetworkSelectionModeManual(serial, "123456"); @@ -132,12 +146,14 @@ TEST_P(RadioHidlTest, setNetworkSelectionModeManual) { RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setNetworkSelectionModeManual finished"; } /* * Test IRadio.getAvailableNetworks() for the response returned. */ TEST_P(RadioHidlTest, getAvailableNetworks) { + LOG(DEBUG) << "getAvailableNetworks"; serial = GetRandomSerialNumber(); radio->getAvailableNetworks(serial); @@ -153,12 +169,14 @@ TEST_P(RadioHidlTest, getAvailableNetworks) { RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getAvailableNetworks finished"; } /* * Test IRadio.getBasebandVersion() for the response returned. */ TEST_P(RadioHidlTest, getBasebandVersion) { + LOG(DEBUG) << "getBasebandVersion"; serial = GetRandomSerialNumber(); radio->getBasebandVersion(serial); @@ -169,12 +187,14 @@ TEST_P(RadioHidlTest, getBasebandVersion) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getBasebandVersion finished"; } /* * Test IRadio.setBandMode() for the response returned. */ TEST_P(RadioHidlTest, setBandMode) { + LOG(DEBUG) << "setBandMode"; serial = GetRandomSerialNumber(); radio->setBandMode(serial, RadioBandMode::BAND_MODE_USA); @@ -186,12 +206,14 @@ TEST_P(RadioHidlTest, setBandMode) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setBandMode finished"; } /* * Test IRadio.getAvailableBandModes() for the response returned. */ TEST_P(RadioHidlTest, getAvailableBandModes) { + LOG(DEBUG) << "getAvailableBandModes"; serial = GetRandomSerialNumber(); radio->getAvailableBandModes(serial); @@ -202,12 +224,14 @@ TEST_P(RadioHidlTest, getAvailableBandModes) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getAvailableBandModes finished"; } /* * Test IRadio.setPreferredNetworkType() for the response returned. */ TEST_P(RadioHidlTest, setPreferredNetworkType) { + LOG(DEBUG) << "setPreferredNetworkType"; serial = GetRandomSerialNumber(); radio->setPreferredNetworkType(serial, PreferredNetworkType::GSM_ONLY); @@ -219,12 +243,14 @@ TEST_P(RadioHidlTest, setPreferredNetworkType) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setPreferredNetworkType finished"; } /* * Test IRadio.getPreferredNetworkType() for the response returned. */ TEST_P(RadioHidlTest, getPreferredNetworkType) { + LOG(DEBUG) << "getPreferredNetworkType"; serial = GetRandomSerialNumber(); radio->getPreferredNetworkType(serial); @@ -235,12 +261,14 @@ TEST_P(RadioHidlTest, getPreferredNetworkType) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getPreferredNetworkType finished"; } /* * Test IRadio.getNeighboringCids() for the response returned. */ TEST_P(RadioHidlTest, getNeighboringCids) { + LOG(DEBUG) << "getNeighboringCids"; serial = GetRandomSerialNumber(); radio->getNeighboringCids(serial); @@ -253,12 +281,14 @@ TEST_P(RadioHidlTest, getNeighboringCids) { {RadioError::NONE, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getNeighboringCids finished"; } /* * Test IRadio.setLocationUpdates() for the response returned. */ TEST_P(RadioHidlTest, setLocationUpdates) { + LOG(DEBUG) << "setLocationUpdates"; serial = GetRandomSerialNumber(); radio->setLocationUpdates(serial, true); @@ -270,12 +300,14 @@ TEST_P(RadioHidlTest, setLocationUpdates) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "setLocationUpdates finished"; } /* * Test IRadio.setCdmaRoamingPreference() for the response returned. */ TEST_P(RadioHidlTest, setCdmaRoamingPreference) { + LOG(DEBUG) << "setCdmaRoamingPreference"; serial = GetRandomSerialNumber(); radio->setCdmaRoamingPreference(serial, CdmaRoamingType::HOME_NETWORK); @@ -288,12 +320,14 @@ TEST_P(RadioHidlTest, setCdmaRoamingPreference) { radioRsp->rspInfo.error, {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setCdmaRoamingPreference finished"; } /* * Test IRadio.getCdmaRoamingPreference() for the response returned. */ TEST_P(RadioHidlTest, getCdmaRoamingPreference) { + LOG(DEBUG) << "getCdmaRoamingPreference"; serial = GetRandomSerialNumber(); radio->getCdmaRoamingPreference(serial); @@ -307,12 +341,14 @@ TEST_P(RadioHidlTest, getCdmaRoamingPreference) { {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getCdmaRoamingPreference finished"; } /* * Test IRadio.getTTYMode() for the response returned. */ TEST_P(RadioHidlTest, getTTYMode) { + LOG(DEBUG) << "getTTYMode"; serial = GetRandomSerialNumber(); radio->getTTYMode(serial); @@ -323,12 +359,14 @@ TEST_P(RadioHidlTest, getTTYMode) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getTTYMode finished"; } /* * Test IRadio.setTTYMode() for the response returned. */ TEST_P(RadioHidlTest, setTTYMode) { + LOG(DEBUG) << "setTTYMode"; serial = GetRandomSerialNumber(); radio->setTTYMode(serial, TtyMode::OFF); @@ -339,12 +377,14 @@ TEST_P(RadioHidlTest, setTTYMode) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "setTTYMode finished"; } /* * Test IRadio.setPreferredVoicePrivacy() for the response returned. */ TEST_P(RadioHidlTest, setPreferredVoicePrivacy) { + LOG(DEBUG) << "setPreferredVoicePrivacy"; serial = GetRandomSerialNumber(); radio->setPreferredVoicePrivacy(serial, true); @@ -356,12 +396,14 @@ TEST_P(RadioHidlTest, setPreferredVoicePrivacy) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setPreferredVoicePrivacy finished"; } /* * Test IRadio.getPreferredVoicePrivacy() for the response returned. */ TEST_P(RadioHidlTest, getPreferredVoicePrivacy) { + LOG(DEBUG) << "getPreferredVoicePrivacy"; serial = GetRandomSerialNumber(); radio->getPreferredVoicePrivacy(serial); @@ -373,12 +415,14 @@ TEST_P(RadioHidlTest, getPreferredVoicePrivacy) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "getPreferredVoicePrivacy finished"; } /* * Test IRadio.getCDMASubscription() for the response returned. */ TEST_P(RadioHidlTest, getCDMASubscription) { + LOG(DEBUG) << "getCDMASubscription"; serial = GetRandomSerialNumber(); radio->getCDMASubscription(serial); @@ -391,12 +435,14 @@ TEST_P(RadioHidlTest, getCDMASubscription) { radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "getCDMASubscription finished"; } /* * Test IRadio.getDeviceIdentity() for the response returned. */ TEST_P(RadioHidlTest, getDeviceIdentity) { + LOG(DEBUG) << "getDeviceIdentity"; serial = GetRandomSerialNumber(); radio->getDeviceIdentity(serial); @@ -408,12 +454,14 @@ TEST_P(RadioHidlTest, getDeviceIdentity) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::EMPTY_RECORD})); } + LOG(DEBUG) << "getDeviceIdentity finished"; } /* * Test IRadio.exitEmergencyCallbackMode() for the response returned. */ TEST_P(RadioHidlTest, exitEmergencyCallbackMode) { + LOG(DEBUG) << "exitEmergencyCallbackMode"; serial = GetRandomSerialNumber(); radio->exitEmergencyCallbackMode(serial); @@ -426,12 +474,14 @@ TEST_P(RadioHidlTest, exitEmergencyCallbackMode) { radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "exitEmergencyCallbackMode finished"; } /* * Test IRadio.getCdmaSubscriptionSource() for the response returned. */ TEST_P(RadioHidlTest, getCdmaSubscriptionSource) { + LOG(DEBUG) << "getCdmaSubscriptionSource"; serial = GetRandomSerialNumber(); radio->getCdmaSubscriptionSource(serial); @@ -444,12 +494,14 @@ TEST_P(RadioHidlTest, getCdmaSubscriptionSource) { radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "getCdmaSubscriptionSource finished"; } /* * Test IRadio.setCdmaSubscriptionSource() for the response returned. */ TEST_P(RadioHidlTest, setCdmaSubscriptionSource) { + LOG(DEBUG) << "setCdmaSubscriptionSource"; serial = GetRandomSerialNumber(); radio->setCdmaSubscriptionSource(serial, CdmaSubscriptionSource::RUIM_SIM); @@ -463,12 +515,14 @@ TEST_P(RadioHidlTest, setCdmaSubscriptionSource) { {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::SUBSCRIPTION_NOT_AVAILABLE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setCdmaSubscriptionSource finished"; } /* * Test IRadio.getVoiceRadioTechnology() for the response returned. */ TEST_P(RadioHidlTest, getVoiceRadioTechnology) { + LOG(DEBUG) << "getVoiceRadioTechnology"; serial = GetRandomSerialNumber(); radio->getVoiceRadioTechnology(serial); @@ -479,12 +533,14 @@ TEST_P(RadioHidlTest, getVoiceRadioTechnology) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getVoiceRadioTechnology finished"; } /* * Test IRadio.getCellInfoList() for the response returned. */ TEST_P(RadioHidlTest, getCellInfoList) { + LOG(DEBUG) << "getCellInfoList"; serial = GetRandomSerialNumber(); radio->getCellInfoList(serial); @@ -497,12 +553,14 @@ TEST_P(RadioHidlTest, getCellInfoList) { {RadioError::NONE, RadioError::NO_NETWORK_FOUND}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getCellInfoList finished"; } /* * Test IRadio.setCellInfoListRate() for the response returned. */ TEST_P(RadioHidlTest, setCellInfoListRate) { + LOG(DEBUG) << "setCellInfoListRate"; serial = GetRandomSerialNumber(); // TODO(sanketpadawe): RIL crashes with value of rate = 10 @@ -515,12 +573,14 @@ TEST_P(RadioHidlTest, setCellInfoListRate) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setCellInfoListRate finished"; } /* * Test IRadio.nvReadItem() for the response returned. */ TEST_P(RadioHidlTest, nvReadItem) { + LOG(DEBUG) << "nvReadItem"; serial = GetRandomSerialNumber(); radio->nvReadItem(serial, NvItem::LTE_BAND_ENABLE_25); @@ -532,12 +592,14 @@ TEST_P(RadioHidlTest, nvReadItem) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "nvReadItem finished"; } /* * Test IRadio.nvWriteItem() for the response returned. */ TEST_P(RadioHidlTest, nvWriteItem) { + LOG(DEBUG) << "nvWriteItem"; serial = GetRandomSerialNumber(); NvWriteItem item; memset(&item, 0, sizeof(item)); @@ -552,12 +614,14 @@ TEST_P(RadioHidlTest, nvWriteItem) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "nvWriteItem finished"; } /* * Test IRadio.nvWriteCdmaPrl() for the response returned. */ TEST_P(RadioHidlTest, nvWriteCdmaPrl) { + LOG(DEBUG) << "nvWriteCdmaPrl"; serial = GetRandomSerialNumber(); std::vector prl = {1, 2, 3, 4, 5}; @@ -570,12 +634,14 @@ TEST_P(RadioHidlTest, nvWriteCdmaPrl) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "nvWriteCdmaPrl finished"; } /* * Test IRadio.nvResetConfig() for the response returned. */ TEST_P(RadioHidlTest, nvResetConfig) { + LOG(DEBUG) << "nvResetConfig"; serial = GetRandomSerialNumber(); radio->nvResetConfig(serial, ResetNvType::FACTORY_RESET); @@ -587,12 +653,14 @@ TEST_P(RadioHidlTest, nvResetConfig) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "nvResetConfig finished"; } /* * Test IRadio.setUiccSubscription() for the response returned. */ TEST_P(RadioHidlTest, setUiccSubscription) { + LOG(DEBUG) << "setUiccSubscription"; serial = GetRandomSerialNumber(); SelectUiccSub item; memset(&item, 0, sizeof(item)); @@ -609,12 +677,14 @@ TEST_P(RadioHidlTest, setUiccSubscription) { RadioError::MODEM_ERR, RadioError::SUBSCRIPTION_NOT_SUPPORTED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setUiccSubscription finished"; } /* * Test IRadio.getHardwareConfig() for the response returned. */ TEST_P(RadioHidlTest, getHardwareConfig) { + LOG(DEBUG) << "getHardwareConfig"; serial = GetRandomSerialNumber(); radio->getHardwareConfig(serial); @@ -626,6 +696,7 @@ TEST_P(RadioHidlTest, getHardwareConfig) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getHardwareConfig finished"; } /* @@ -651,6 +722,7 @@ TEST_P(RadioHidlTest, DISABLED_requestShutdown) { * Test IRadio.getRadioCapability() for the response returned. */ TEST_P(RadioHidlTest, getRadioCapability) { + LOG(DEBUG) << "getRadioCapability"; serial = GetRandomSerialNumber(); radio->getRadioCapability(serial); @@ -661,12 +733,14 @@ TEST_P(RadioHidlTest, getRadioCapability) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getRadioCapability finished"; } /* * Test IRadio.setRadioCapability() for the response returned. */ TEST_P(RadioHidlTest, setRadioCapability) { + LOG(DEBUG) << "setRadioCapability"; serial = GetRandomSerialNumber(); RadioCapability rc; memset(&rc, 0, sizeof(rc)); @@ -682,12 +756,14 @@ TEST_P(RadioHidlTest, setRadioCapability) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setRadioCapability finished"; } /* * Test IRadio.startLceService() for the response returned. */ TEST_P(RadioHidlTest, startLceService) { + LOG(DEBUG) << "startLceService"; serial = GetRandomSerialNumber(); radio->startLceService(serial, 5, true); @@ -701,12 +777,14 @@ TEST_P(RadioHidlTest, startLceService) { {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT, RadioError::NONE})); } + LOG(DEBUG) << "startLceService finished"; } /* * Test IRadio.stopLceService() for the response returned. */ TEST_P(RadioHidlTest, stopLceService) { + LOG(DEBUG) << "stopLceService"; serial = GetRandomSerialNumber(); radio->stopLceService(serial); @@ -719,12 +797,14 @@ TEST_P(RadioHidlTest, stopLceService) { {RadioError::NONE, RadioError::LCE_NOT_SUPPORTED, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } + LOG(DEBUG) << "stopLceService finished"; } /* * Test IRadio.pullLceData() for the response returned. */ TEST_P(RadioHidlTest, pullLceData) { + LOG(DEBUG) << "pullLceData"; serial = GetRandomSerialNumber(); radio->pullLceData(serial); @@ -738,12 +818,14 @@ TEST_P(RadioHidlTest, pullLceData) { RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}, CHECK_OEM_ERROR)); } + LOG(DEBUG) << "pullLceData finished"; } /* * Test IRadio.getModemActivityInfo() for the response returned. */ TEST_P(RadioHidlTest, getModemActivityInfo) { + LOG(DEBUG) << "getModemActivityInfo"; serial = GetRandomSerialNumber(); radio->getModemActivityInfo(serial); @@ -755,6 +837,7 @@ TEST_P(RadioHidlTest, getModemActivityInfo) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "getModemActivityInfo finished"; } /* @@ -840,6 +923,7 @@ TEST_P(RadioHidlTest, DISABLED_setAllowedCarriers) { * Test IRadio.getAllowedCarriers() for the response returned. */ TEST_P(RadioHidlTest, getAllowedCarriers) { + LOG(DEBUG) << "getAllowedCarriers"; serial = GetRandomSerialNumber(); radio->getAllowedCarriers(serial); @@ -851,12 +935,14 @@ TEST_P(RadioHidlTest, getAllowedCarriers) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "getAllowedCarriers finished"; } /* * Test IRadio.sendDeviceState() for the response returned. */ TEST_P(RadioHidlTest, sendDeviceState) { + LOG(DEBUG) << "sendDeviceState"; serial = GetRandomSerialNumber(); radio->sendDeviceState(serial, DeviceStateType::POWER_SAVE_MODE, true); @@ -870,12 +956,14 @@ TEST_P(RadioHidlTest, sendDeviceState) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "sendDeviceState finished"; } /* * Test IRadio.setIndicationFilter() for the response returned. */ TEST_P(RadioHidlTest, setIndicationFilter) { + LOG(DEBUG) << "setIndicationFilter"; serial = GetRandomSerialNumber(); radio->setIndicationFilter(serial, 1); @@ -889,12 +977,14 @@ TEST_P(RadioHidlTest, setIndicationFilter) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setIndicationFilter finished"; } /* * Test IRadio.setSimCardPower() for the response returned. */ TEST_P(RadioHidlTest, setSimCardPower) { + LOG(DEBUG) << "setSimCardPower"; serial = GetRandomSerialNumber(); radio->setSimCardPower(serial, true); @@ -906,4 +996,5 @@ TEST_P(RadioHidlTest, setSimCardPower) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } + LOG(DEBUG) << "setSimCardPower finished"; } 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 58c3bbd7de..0807deec2d 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include using namespace ::android::hardware::radio::V1_0; @@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.sendSms() for the response returned. */ TEST_P(RadioHidlTest, sendSms) { + LOG(DEBUG) << "sendSms"; serial = GetRandomSerialNumber(); GsmSmsMessage msg; msg.smscPdu = ""; @@ -40,12 +42,14 @@ TEST_P(RadioHidlTest, sendSms) { CHECK_GENERAL_ERROR)); EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); } + LOG(DEBUG) << "sendSms finished"; } /* * Test IRadio.sendSMSExpectMore() for the response returned. */ TEST_P(RadioHidlTest, sendSMSExpectMore) { + LOG(DEBUG) << "sendSMSExpectMore"; serial = GetRandomSerialNumber(); GsmSmsMessage msg; msg.smscPdu = ""; @@ -66,12 +70,14 @@ TEST_P(RadioHidlTest, sendSMSExpectMore) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendSMSExpectMore finished"; } /* * Test IRadio.acknowledgeLastIncomingGsmSms() for the response returned. */ TEST_P(RadioHidlTest, acknowledgeLastIncomingGsmSms) { + LOG(DEBUG) << "acknowledgeLastIncomingGsmSms"; serial = GetRandomSerialNumber(); bool success = true; @@ -87,12 +93,14 @@ TEST_P(RadioHidlTest, acknowledgeLastIncomingGsmSms) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "acknowledgeLastIncomingGsmSms finished"; } /* * Test IRadio.acknowledgeIncomingGsmSmsWithPdu() for the response returned. */ TEST_P(RadioHidlTest, acknowledgeIncomingGsmSmsWithPdu) { + LOG(DEBUG) << "acknowledgeIncomingGsmSmsWithPdu"; serial = GetRandomSerialNumber(); bool success = true; std::string ackPdu = ""; @@ -106,12 +114,14 @@ TEST_P(RadioHidlTest, acknowledgeIncomingGsmSmsWithPdu) { if (cardStatus.cardState == CardState::ABSENT) { // TODO(shuoq): Will add error check when we know the expected error from QC } + LOG(DEBUG) << "acknowledgeIncomingGsmSmsWithPdu finished"; } /* * Test IRadio.sendCdmaSms() for the response returned. */ TEST_P(RadioHidlTest, sendCdmaSms) { + LOG(DEBUG) << "sendCdmaSms"; serial = GetRandomSerialNumber(); // Create a CdmaSmsAddress @@ -150,12 +160,14 @@ TEST_P(RadioHidlTest, sendCdmaSms) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendCdmaSms finished"; } /* * Test IRadio.acknowledgeLastIncomingCdmaSms() for the response returned. */ TEST_P(RadioHidlTest, acknowledgeLastIncomingCdmaSms) { + LOG(DEBUG) << "acknowledgeLastIncomingCdmaSms"; serial = GetRandomSerialNumber(); // Create a CdmaSmsAck @@ -174,12 +186,14 @@ TEST_P(RadioHidlTest, acknowledgeLastIncomingCdmaSms) { {RadioError::INVALID_ARGUMENTS, RadioError::NO_SMS_TO_ACK}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "acknowledgeLastIncomingCdmaSms finished"; } /* * Test IRadio.sendImsSms() for the response returned. */ TEST_P(RadioHidlTest, sendImsSms) { + LOG(DEBUG) << "sendImsSms"; serial = GetRandomSerialNumber(); // Create a CdmaSmsAddress @@ -224,12 +238,14 @@ TEST_P(RadioHidlTest, sendImsSms) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::INVALID_ARGUMENTS}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendImsSms finished"; } /* * Test IRadio.getSmscAddress() for the response returned. */ TEST_P(RadioHidlTest, getSmscAddress) { + LOG(DEBUG) << "getSmscAddress"; serial = GetRandomSerialNumber(); radio->getSmscAddress(serial); @@ -244,12 +260,14 @@ TEST_P(RadioHidlTest, getSmscAddress) { {RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getSmscAddress finished"; } /* * Test IRadio.setSmscAddress() for the response returned. */ TEST_P(RadioHidlTest, setSmscAddress) { + LOG(DEBUG) << "setSmscAddress"; serial = GetRandomSerialNumber(); hidl_string address = hidl_string("smscAddress"); @@ -265,12 +283,14 @@ TEST_P(RadioHidlTest, setSmscAddress) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_SMS_FORMAT, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setSmscAddress finished"; } /* * Test IRadio.writeSmsToSim() for the response returned. */ TEST_P(RadioHidlTest, writeSmsToSim) { + LOG(DEBUG) << "writeSmsToSim"; serial = GetRandomSerialNumber(); SmsWriteArgs smsWriteArgs; smsWriteArgs.status = SmsWriteArgsStatus::REC_UNREAD; @@ -291,12 +311,14 @@ TEST_P(RadioHidlTest, writeSmsToSim) { RadioError::NO_RESOURCES, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "writeSmsToSim finished"; } /* * Test IRadio.deleteSmsOnSim() for the response returned. */ TEST_P(RadioHidlTest, deleteSmsOnSim) { + LOG(DEBUG) << "deleteSmsOnSim"; serial = GetRandomSerialNumber(); int index = 1; @@ -314,12 +336,14 @@ TEST_P(RadioHidlTest, deleteSmsOnSim) { RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "deleteSmsOnSim finished"; } /* * Test IRadio.writeSmsToRuim() for the response returned. */ TEST_P(RadioHidlTest, writeSmsToRuim) { + LOG(DEBUG) << "writeSmsToRuim"; serial = GetRandomSerialNumber(); // Create a CdmaSmsAddress @@ -365,12 +389,14 @@ TEST_P(RadioHidlTest, writeSmsToRuim) { RadioError::NO_SUCH_ENTRY, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "writeSmsToRuim finished"; } /* * Test IRadio.deleteSmsOnRuim() for the response returned. */ TEST_P(RadioHidlTest, deleteSmsOnRuim) { + LOG(DEBUG) << "deleteSmsOnRuim"; serial = GetRandomSerialNumber(); int index = 1; @@ -416,12 +442,14 @@ TEST_P(RadioHidlTest, deleteSmsOnRuim) { RadioError::MODEM_ERR, RadioError::NO_SUCH_ENTRY, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "deleteSmsOnRuim finished"; } /* * Test IRadio.reportSmsMemoryStatus() for the response returned. */ TEST_P(RadioHidlTest, reportSmsMemoryStatus) { + LOG(DEBUG) << "reportSmsMemoryStatus"; serial = GetRandomSerialNumber(); bool available = true; @@ -437,4 +465,5 @@ TEST_P(RadioHidlTest, reportSmsMemoryStatus) { RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "reportSmsMemoryStatus finished"; } 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 1170111fba..193c25dcc0 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include using namespace ::android::hardware::radio::V1_0; @@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0; * Test IRadio.sendEnvelope() for the response returned. */ TEST_P(RadioHidlTest, sendEnvelope) { + LOG(DEBUG) << "sendEnvelope"; serial = GetRandomSerialNumber(); // Test with sending empty string @@ -39,12 +41,14 @@ TEST_P(RadioHidlTest, sendEnvelope) { RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendEnvelope finished"; } /* * Test IRadio.sendTerminalResponseToSim() for the response returned. */ TEST_P(RadioHidlTest, sendTerminalResponseToSim) { + LOG(DEBUG) << "sendTerminalResponseToSim"; serial = GetRandomSerialNumber(); // Test with sending empty string @@ -62,12 +66,14 @@ TEST_P(RadioHidlTest, sendTerminalResponseToSim) { {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendTerminalResponseToSim finished"; } /* * Test IRadio.handleStkCallSetupRequestFromSim() for the response returned. */ TEST_P(RadioHidlTest, handleStkCallSetupRequestFromSim) { + LOG(DEBUG) << "handleStkCallSetupRequestFromSim"; serial = GetRandomSerialNumber(); bool accept = false; @@ -83,12 +89,14 @@ TEST_P(RadioHidlTest, handleStkCallSetupRequestFromSim) { RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "handleStkCallSetupRequestFromSim finished"; } /* * Test IRadio.reportStkServiceIsRunning() for the response returned. */ TEST_P(RadioHidlTest, reportStkServiceIsRunning) { + LOG(DEBUG) << "reportStkServiceIsRunning"; serial = GetRandomSerialNumber(); radio->reportStkServiceIsRunning(serial); @@ -101,6 +109,7 @@ TEST_P(RadioHidlTest, reportStkServiceIsRunning) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "reportStkServiceIsRunning finished"; } /* @@ -108,6 +117,7 @@ TEST_P(RadioHidlTest, reportStkServiceIsRunning) { * string. */ TEST_P(RadioHidlTest, sendEnvelopeWithStatus) { + LOG(DEBUG) << "sendEnvelopeWithStatus"; serial = GetRandomSerialNumber(); // Test with sending empty string @@ -125,4 +135,5 @@ TEST_P(RadioHidlTest, sendEnvelopeWithStatus) { {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendEnvelopeWithStatus finished"; } 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 3c833c0c20..3583514014 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -14,11 +14,13 @@ * limitations under the License. */ +#include #include void RadioHidlTest::SetUp() { radio = IRadio::getService(GetParam()); if (radio == NULL) { + LOG(DEBUG) << "Radio is NULL, waiting 1 minute to retry"; sleep(60); radio = IRadio::getService(GetParam()); } @@ -70,4 +72,4 @@ void RadioHidlTest::updateSimCardStatus() { serial = GetRandomSerialNumber(); radio->getIccCardStatus(serial); EXPECT_EQ(std::cv_status::no_timeout, wait()); -} \ 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 a192a33a07..f6de2f854a 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp @@ -14,12 +14,14 @@ * limitations under the License. */ +#include #include /* * Test IRadio.getCurrentCalls() for the response returned. */ TEST_P(RadioHidlTest, getCurrentCalls) { + LOG(DEBUG) << "getCurrentCalls"; serial = GetRandomSerialNumber(); radio->getCurrentCalls(serial); @@ -30,12 +32,14 @@ TEST_P(RadioHidlTest, getCurrentCalls) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getCurrentCalls finished"; } /* * Test IRadio.dial() for the response returned. */ TEST_P(RadioHidlTest, dial) { + LOG(DEBUG) << "dial"; serial = GetRandomSerialNumber(); Dial dialInfo; @@ -57,12 +61,14 @@ TEST_P(RadioHidlTest, dial) { RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "dial finished"; } /* * Test IRadio.hangup() for the response returned. */ TEST_P(RadioHidlTest, hangup) { + LOG(DEBUG) << "hangup"; serial = GetRandomSerialNumber(); radio->hangup(serial, 1); @@ -76,12 +82,14 @@ TEST_P(RadioHidlTest, hangup) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "hangup finished"; } /* * Test IRadio.hangupWaitingOrBackground() for the response returned. */ TEST_P(RadioHidlTest, hangupWaitingOrBackground) { + LOG(DEBUG) << "hangupWaitingOrBackground"; serial = GetRandomSerialNumber(); radio->hangupWaitingOrBackground(serial); @@ -94,12 +102,14 @@ TEST_P(RadioHidlTest, hangupWaitingOrBackground) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "hangupWaitingOrBackground finished"; } /* * Test IRadio.hangupForegroundResumeBackground() for the response returned. */ TEST_P(RadioHidlTest, hangupForegroundResumeBackground) { + LOG(DEBUG) << "hangupForegroundResumeBackground"; serial = GetRandomSerialNumber(); radio->hangupForegroundResumeBackground(serial); @@ -112,12 +122,14 @@ TEST_P(RadioHidlTest, hangupForegroundResumeBackground) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "hangupForegroundResumeBackground finished"; } /* * Test IRadio.switchWaitingOrHoldingAndActive() for the response returned. */ TEST_P(RadioHidlTest, switchWaitingOrHoldingAndActive) { + LOG(DEBUG) << "switchWaitingOrHoldingAndActive"; serial = GetRandomSerialNumber(); radio->switchWaitingOrHoldingAndActive(serial); @@ -130,12 +142,14 @@ TEST_P(RadioHidlTest, switchWaitingOrHoldingAndActive) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "switchWaitingOrHoldingAndActive finished"; } /* * Test IRadio.conference() for the response returned. */ TEST_P(RadioHidlTest, conference) { + LOG(DEBUG) << "conference"; serial = GetRandomSerialNumber(); radio->conference(serial); @@ -148,12 +162,14 @@ TEST_P(RadioHidlTest, conference) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "conference finished"; } /* * Test IRadio.rejectCall() for the response returned. */ TEST_P(RadioHidlTest, rejectCall) { + LOG(DEBUG) << "rejectCall"; serial = GetRandomSerialNumber(); radio->rejectCall(serial); @@ -166,12 +182,14 @@ TEST_P(RadioHidlTest, rejectCall) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "rejectCall finished"; } /* * Test IRadio.getLastCallFailCause() for the response returned. */ TEST_P(RadioHidlTest, getLastCallFailCause) { + LOG(DEBUG) << "getLastCallFailCause"; serial = GetRandomSerialNumber(); radio->getLastCallFailCause(serial); @@ -183,12 +201,14 @@ TEST_P(RadioHidlTest, getLastCallFailCause) { ASSERT_TRUE( CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getLastCallFailCause finished"; } /* * Test IRadio.sendUssd() for the response returned. */ TEST_P(RadioHidlTest, sendUssd) { + LOG(DEBUG) << "sendUssd"; serial = GetRandomSerialNumber(); radio->sendUssd(serial, hidl_string("test")); EXPECT_EQ(std::cv_status::no_timeout, wait()); @@ -201,12 +221,14 @@ TEST_P(RadioHidlTest, sendUssd) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendUssd finished"; } /* * Test IRadio.cancelPendingUssd() for the response returned. */ TEST_P(RadioHidlTest, cancelPendingUssd) { + LOG(DEBUG) << "cancelPendingUssd"; serial = GetRandomSerialNumber(); radio->cancelPendingUssd(serial); @@ -220,12 +242,14 @@ TEST_P(RadioHidlTest, cancelPendingUssd) { {RadioError::NONE, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "cancelPendingUssd finished"; } /* * Test IRadio.getCallForwardStatus() for the response returned. */ TEST_P(RadioHidlTest, getCallForwardStatus) { + LOG(DEBUG) << "getCallForwardStatus"; serial = GetRandomSerialNumber(); CallForwardInfo callInfo; memset(&callInfo, 0, sizeof(callInfo)); @@ -242,12 +266,14 @@ TEST_P(RadioHidlTest, getCallForwardStatus) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getCallForwardStatus finished"; } /* * Test IRadio.setCallForward() for the response returned. */ TEST_P(RadioHidlTest, setCallForward) { + LOG(DEBUG) << "setCallForward"; serial = GetRandomSerialNumber(); CallForwardInfo callInfo; memset(&callInfo, 0, sizeof(callInfo)); @@ -264,12 +290,14 @@ TEST_P(RadioHidlTest, setCallForward) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setCallForward finished"; } /* * Test IRadio.getCallWaiting() for the response returned. */ TEST_P(RadioHidlTest, getCallWaiting) { + LOG(DEBUG) << "getCallWaiting"; serial = GetRandomSerialNumber(); radio->getCallWaiting(serial, 1); @@ -283,12 +311,14 @@ TEST_P(RadioHidlTest, getCallWaiting) { {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "getCallWaiting finished"; } /* * Test IRadio.setCallWaiting() for the response returned. */ TEST_P(RadioHidlTest, setCallWaiting) { + LOG(DEBUG) << "setCallWaiting"; serial = GetRandomSerialNumber(); radio->setCallWaiting(serial, true, 1); @@ -302,12 +332,14 @@ TEST_P(RadioHidlTest, setCallWaiting) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setCallWaiting finished"; } /* * Test IRadio.acceptCall() for the response returned. */ TEST_P(RadioHidlTest, acceptCall) { + LOG(DEBUG) << "acceptCall"; serial = GetRandomSerialNumber(); radio->acceptCall(serial); @@ -320,12 +352,14 @@ TEST_P(RadioHidlTest, acceptCall) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "acceptCall finished"; } /* * Test IRadio.separateConnection() for the response returned. */ TEST_P(RadioHidlTest, separateConnection) { + LOG(DEBUG) << "separateConnection"; serial = GetRandomSerialNumber(); radio->separateConnection(serial, 1); @@ -339,12 +373,14 @@ TEST_P(RadioHidlTest, separateConnection) { {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "separateConnection finished"; } /* * Test IRadio.explicitCallTransfer() for the response returned. */ TEST_P(RadioHidlTest, explicitCallTransfer) { + LOG(DEBUG) << "explicitCallTransfer"; serial = GetRandomSerialNumber(); radio->explicitCallTransfer(serial); @@ -357,12 +393,14 @@ TEST_P(RadioHidlTest, explicitCallTransfer) { {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "explicitCallTransfer finished"; } /* * Test IRadio.sendCDMAFeatureCode() for the response returned. */ TEST_P(RadioHidlTest, sendCDMAFeatureCode) { + LOG(DEBUG) << "sendCDMAFeatureCode"; serial = GetRandomSerialNumber(); radio->sendCDMAFeatureCode(serial, hidl_string()); @@ -377,12 +415,14 @@ TEST_P(RadioHidlTest, sendCDMAFeatureCode) { RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendCDMAFeatureCode finished"; } /* * Test IRadio.sendDtmf() for the response returned. */ TEST_P(RadioHidlTest, sendDtmf) { + LOG(DEBUG) << "sendDtmf"; serial = GetRandomSerialNumber(); radio->sendDtmf(serial, "1"); @@ -397,12 +437,14 @@ TEST_P(RadioHidlTest, sendDtmf) { RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendDtmf finished"; } /* * Test IRadio.startDtmf() for the response returned. */ TEST_P(RadioHidlTest, startDtmf) { + LOG(DEBUG) << "startDtmf"; serial = GetRandomSerialNumber(); radio->startDtmf(serial, "1"); @@ -417,12 +459,14 @@ TEST_P(RadioHidlTest, startDtmf) { RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "startDtmf finished"; } /* * Test IRadio.stopDtmf() for the response returned. */ TEST_P(RadioHidlTest, stopDtmf) { + LOG(DEBUG) << "stopDtmf"; serial = GetRandomSerialNumber(); radio->stopDtmf(serial); @@ -436,12 +480,14 @@ TEST_P(RadioHidlTest, stopDtmf) { RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "stopDtmf finished"; } /* * Test IRadio.setMute() for the response returned. */ TEST_P(RadioHidlTest, setMute) { + LOG(DEBUG) << "setMute"; serial = GetRandomSerialNumber(); radio->setMute(serial, true); @@ -454,12 +500,14 @@ TEST_P(RadioHidlTest, setMute) { {RadioError::NONE, RadioError::INVALID_ARGUMENTS}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "setMute finished"; } /* * Test IRadio.getMute() for the response returned. */ TEST_P(RadioHidlTest, getMute) { + LOG(DEBUG) << "getMute"; serial = GetRandomSerialNumber(); radio->getMute(serial); @@ -470,12 +518,14 @@ TEST_P(RadioHidlTest, getMute) { if (cardStatus.cardState == CardState::ABSENT) { EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } + LOG(DEBUG) << "getMute finished"; } /* * Test IRadio.sendBurstDtmf() for the response returned. */ TEST_P(RadioHidlTest, sendBurstDtmf) { + LOG(DEBUG) << "sendBurstDtmf"; serial = GetRandomSerialNumber(); radio->sendBurstDtmf(serial, "1", 0, 0); @@ -489,4 +539,5 @@ TEST_P(RadioHidlTest, sendBurstDtmf) { RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, CHECK_GENERAL_ERROR)); } + LOG(DEBUG) << "sendBurstDtmf finished"; } 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 6bd2c88a05..6c7870d399 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_api.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_api.cpp @@ -14,12 +14,14 @@ * limitations under the License. */ +#include #include /* * Test ISap.connectReq() for the response returned. */ TEST_P(SapHidlTest, connectReq) { + LOG(DEBUG) << "connectReq"; token = GetRandomSerialNumber(); int32_t maxMsgSize = 100; @@ -30,23 +32,27 @@ TEST_P(SapHidlTest, connectReq) { // Modem side need time for connect to finish. Adding a waiting time to prevent // disconnect being requested right after connect request. sleep(1); + LOG(DEBUG) << "connectReq finished"; } /* * Test IRadio.disconnectReq() for the response returned */ TEST_P(SapHidlTest, disconnectReq) { + LOG(DEBUG) << "disconnectReq"; token = GetRandomSerialNumber(); sap->disconnectReq(token); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); + LOG(DEBUG) << "disconnectReq finished"; } /* * Test IRadio.apduReq() for the response returned. */ TEST_P(SapHidlTest, apduReq) { + LOG(DEBUG) << "apduReq"; token = GetRandomSerialNumber(); SapApduType sapApduType = SapApduType::APDU; android::hardware::hidl_vec command = {}; @@ -59,12 +65,14 @@ TEST_P(SapHidlTest, apduReq) { CheckAnyOfErrors(sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_NOT_ACCESSSIBLE, SapResultCode::CARD_REMOVED})); + LOG(DEBUG) << "apduReq finished"; } /* * Test IRadio.transferAtrReq() for the response returned. */ TEST_P(SapHidlTest, transferAtrReq) { + LOG(DEBUG) << "transferAtrReq"; token = GetRandomSerialNumber(); sap->transferAtrReq(token); @@ -75,12 +83,14 @@ TEST_P(SapHidlTest, transferAtrReq) { CheckAnyOfErrors(sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::DATA_NOT_AVAILABLE, SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED})); + LOG(DEBUG) << "transferAtrReq finished"; } /* * Test IRadio.powerReq() for the response returned. */ TEST_P(SapHidlTest, powerReq) { + LOG(DEBUG) << "powerReq"; token = GetRandomSerialNumber(); bool state = true; @@ -92,12 +102,14 @@ TEST_P(SapHidlTest, powerReq) { sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_NOT_ACCESSSIBLE, SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED, SapResultCode::CARD_ALREADY_POWERED_ON})); + LOG(DEBUG) << "powerReq finished"; } /* * Test IRadio.resetSimReq() for the response returned. */ TEST_P(SapHidlTest, resetSimReq) { + LOG(DEBUG) << "resetSimReq"; token = GetRandomSerialNumber(); sap->resetSimReq(token); @@ -108,12 +120,14 @@ TEST_P(SapHidlTest, resetSimReq) { CheckAnyOfErrors(sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_NOT_ACCESSSIBLE, SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED})); + LOG(DEBUG) << "resetSimReq finished"; } /* * Test IRadio.transferCardReaderStatusReq() for the response returned. */ TEST_P(SapHidlTest, transferCardReaderStatusReq) { + LOG(DEBUG) << "transferCardReaderStatusReq"; token = GetRandomSerialNumber(); sap->transferCardReaderStatusReq(token); @@ -122,12 +136,14 @@ TEST_P(SapHidlTest, transferCardReaderStatusReq) { ASSERT_TRUE(CheckAnyOfErrors( sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::DATA_NOT_AVAILABLE})); + LOG(DEBUG) << "transferCardReaderStatusReq finished"; } /* * Test IRadio.setTransferProtocolReq() for the response returned. */ TEST_P(SapHidlTest, setTransferProtocolReq) { + LOG(DEBUG) << "setTransferProtocolReq"; token = GetRandomSerialNumber(); SapTransferProtocol sapTransferProtocol = SapTransferProtocol::T0; @@ -136,4 +152,5 @@ TEST_P(SapHidlTest, setTransferProtocolReq) { EXPECT_EQ(sapCb->sapResponseToken, token); EXPECT_EQ(SapResultCode::NOT_SUPPORTED, sapCb->sapResultCode); + LOG(DEBUG) << "setTransferProtocolReq finished"; } diff --git a/radio/1.0/vts/functional/vts_hal_radio_target_test.xml b/radio/1.0/vts/functional/vts_hal_radio_target_test.xml index b91119d40a..82af2ee388 100644 --- a/radio/1.0/vts/functional/vts_hal_radio_target_test.xml +++ b/radio/1.0/vts/functional/vts_hal_radio_target_test.xml @@ -30,5 +30,6 @@ diff --git a/radio/1.1/vts/functional/AndroidTest.xml b/radio/1.1/vts/functional/AndroidTest.xml index 3699575223..f1bc7a80ed 100644 --- a/radio/1.1/vts/functional/AndroidTest.xml +++ b/radio/1.1/vts/functional/AndroidTest.xml @@ -29,6 +29,7 @@ diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp index c81a8d9795..acb1b0ef6d 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -735,7 +735,7 @@ TEST_P(RadioHidlTest_v1_2, getDataRegistrationState) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_2->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_2->rspInfo.serial); - ALOGI("getVoiceRegistrationStateResponse_1_2, rspInfo.error = %s\n", + ALOGI("getDataRegistrationStateResponse_1_2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); ASSERT_TRUE(CheckAnyOfErrors( radioRsp_v1_2->rspInfo.error,