From cf243eba435afcd7fc38d96c695cec3ca0bdd319 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 2 Nov 2017 21:45:10 -0700 Subject: [PATCH] Modify VTS error check so that the error code can be displayed - Add AssertionResult in gtest to display logs - Refactor all the error checks - Replace INTERNAL_ERR with INVALID_ARGUMENT for requestIsimAuthentication Bug: 63760809 Bug: 65150146 Test: run vts Change-Id: Iec4bdfd89ccd8d8d8c6e1bd8f720a88d67f23cb3 --- radio/1.0/vts/functional/Android.bp | 5 +- .../radio_hidl_hal_cell_broadcast.cpp | 42 ++-- .../vts/functional/radio_hidl_hal_data.cpp | 39 ++-- .../1.0/vts/functional/radio_hidl_hal_icc.cpp | 14 +- .../1.0/vts/functional/radio_hidl_hal_ims.cpp | 44 ++-- .../vts/functional/radio_hidl_hal_misc.cpp | 210 +++++++++--------- .../1.0/vts/functional/radio_hidl_hal_sms.cpp | 119 +++++----- .../1.0/vts/functional/radio_hidl_hal_stk.cpp | 38 ++-- .../vts/functional/radio_hidl_hal_test.cpp | 14 -- .../functional/radio_hidl_hal_utils_v1_0.h | 6 - .../vts/functional/radio_hidl_hal_voice.cpp | 183 ++++++++------- radio/1.0/vts/functional/sap_hidl_hal_api.cpp | 37 ++- radio/1.0/vts/functional/vts_test_util.cpp | 36 ++- radio/1.0/vts/functional/vts_test_util.h | 35 ++- .../1.1/vts/functional/radio_hidl_hal_api.cpp | 43 ++-- .../vts/functional/radio_hidl_hal_test.cpp | 16 +- .../1.2/vts/functional/radio_hidl_hal_api.cpp | 141 ++++++------ 17 files changed, 531 insertions(+), 491 deletions(-) diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 61136ae644..afbb1c4b18 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -50,10 +50,13 @@ cc_test { cc_library_static { name: "RadioVtsTestUtilBase", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs : [ "vts_test_util.cpp" ], + shared_libs: [ + "android.hardware.radio@1.0", + ], } cc_library_headers { 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 a81861d699..8c4ccf6bfe 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 @@ -74,11 +74,10 @@ TEST_F(RadioHidlTest, setGsmBroadcastConfig) { 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::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -95,9 +94,10 @@ TEST_F(RadioHidlTest, getGsmBroadcastConfig) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -122,9 +122,9 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_MODEM_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -141,7 +141,8 @@ TEST_F(RadioHidlTest, getCdmaBroadcastConfig) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -159,9 +160,9 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS}, + CHECK_GENERAL_ERROR)); } } @@ -179,11 +180,10 @@ TEST_F(RadioHidlTest, setGsmBroadcastActivation) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_MODEM_STATE, + RadioError::INVALID_STATE, RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } 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 4684e0f961..949668842f 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_data.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_data.cpp @@ -75,11 +75,11 @@ TEST_F(RadioHidlTest, setupDataCall) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError()); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW, + RadioError::OP_NOT_ALLOWED_DURING_VOICE_CALL, + RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}, + CHECK_OEM_ERROR)); } } @@ -98,10 +98,10 @@ TEST_F(RadioHidlTest, deactivateDataCall) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError() || - radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::SIM_ABSENT, RadioError::INVALID_CALL_ID}, + CHECK_OEM_ERROR)); } } @@ -118,9 +118,9 @@ TEST_F(RadioHidlTest, getDataCallList) { 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::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT})); } } @@ -160,10 +160,10 @@ TEST_F(RadioHidlTest, setInitialAttachApn) { 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()); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::SUBSCRIPTION_NOT_AVAILABLE}, + CHECK_OEM_ERROR)); } } @@ -224,9 +224,8 @@ TEST_F(RadioHidlTest, setDataProfile) { 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::SIM_ABSENT || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, + RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED})); } } 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 eb5d3372e1..566a51667c 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -310,14 +310,10 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INTERNAL_ERR, + RadioError::INVALID_SIM_STATE, RadioError::MODEM_ERR, RadioError::NO_MEMORY, + RadioError::PASSWORD_INCORRECT, RadioError::SIM_ABSENT, RadioError::SYSTEM_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 aa9d9871c9..e8e92417b8 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp @@ -31,7 +31,8 @@ TEST_F(RadioHidlTest, getClir) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::MODEM_ERR); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -70,9 +71,9 @@ TEST_F(RadioHidlTest, getFacilityLockForApp) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -94,9 +95,9 @@ TEST_F(RadioHidlTest, setFacilityLockForApp) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -116,11 +117,10 @@ TEST_F(RadioHidlTest, setBarringPassword) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::FDN_CHECK_FAILURE, + RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -137,7 +137,8 @@ TEST_F(RadioHidlTest, getClip) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::MODEM_ERR); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -155,8 +156,8 @@ TEST_F(RadioHidlTest, setSuppServiceNotifications) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::SIM_ABSENT})); } } @@ -174,7 +175,11 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS RadioError::RADIO_NOT_AVAILABLE, + RadioError::NO_MEMORY, RadioError::SYSTEM_ERR, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::CANCELLED})); } } @@ -191,8 +196,9 @@ TEST_F(RadioHidlTest, getImsRegistrationState) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::MODEM_ERR, RadioError::INVALID_MODEM_STATE}, + CHECK_GENERAL_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 f813532b3d..81c6bb5336 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -28,7 +28,7 @@ TEST_F(RadioHidlTest, getSignalStrength) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -44,7 +44,7 @@ TEST_F(RadioHidlTest, getVoiceRegistrationState) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -60,7 +60,7 @@ TEST_F(RadioHidlTest, getOperator) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -76,7 +76,7 @@ TEST_F(RadioHidlTest, setRadioPower) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -92,7 +92,7 @@ TEST_F(RadioHidlTest, getNetworkSelectionMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -108,10 +108,10 @@ TEST_F(RadioHidlTest, setNetworkSelectionModeAutomatic) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } @@ -127,11 +127,10 @@ TEST_F(RadioHidlTest, setNetworkSelectionModeManual) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, + RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -148,11 +147,11 @@ TEST_F(RadioHidlTest, getAvailableNetworks) { 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 || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::CANCELLED, RadioError::DEVICE_IN_USE, + RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } @@ -168,7 +167,7 @@ TEST_F(RadioHidlTest, getBasebandVersion) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -184,7 +183,8 @@ TEST_F(RadioHidlTest, setBandMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -200,7 +200,7 @@ TEST_F(RadioHidlTest, getAvailableBandModes) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -216,7 +216,8 @@ TEST_F(RadioHidlTest, setPreferredNetworkType) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -232,7 +233,7 @@ TEST_F(RadioHidlTest, getPreferredNetworkType) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -248,8 +249,9 @@ TEST_F(RadioHidlTest, getNeighboringCids) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -265,8 +267,8 @@ TEST_F(RadioHidlTest, setLocationUpdates) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::SIM_ABSENT})); } } @@ -282,9 +284,9 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -300,9 +302,10 @@ TEST_F(RadioHidlTest, getCdmaRoamingPreference) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -318,7 +321,7 @@ TEST_F(RadioHidlTest, getTTYMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -334,7 +337,7 @@ TEST_F(RadioHidlTest, setTTYMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -350,8 +353,8 @@ TEST_F(RadioHidlTest, setPreferredVoicePrivacy) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -367,8 +370,8 @@ TEST_F(RadioHidlTest, getPreferredVoicePrivacy) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -384,9 +387,9 @@ TEST_F(RadioHidlTest, getCDMASubscription) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } } @@ -402,8 +405,8 @@ TEST_F(RadioHidlTest, getDeviceIdentity) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::EMPTY_RECORD); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::EMPTY_RECORD})); } } @@ -419,9 +422,9 @@ TEST_F(RadioHidlTest, exitEmergencyCallbackMode) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } } @@ -437,9 +440,9 @@ TEST_F(RadioHidlTest, getCdmaSubscriptionSource) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } } @@ -455,10 +458,10 @@ TEST_F(RadioHidlTest, setCdmaSubscriptionSource) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE || - radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::SUBSCRIPTION_NOT_AVAILABLE}, + CHECK_GENERAL_ERROR)); } } @@ -474,7 +477,7 @@ TEST_F(RadioHidlTest, getVoiceRadioTechnology) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -490,8 +493,9 @@ TEST_F(RadioHidlTest, getCellInfoList) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::NO_NETWORK_FOUND}, + CHECK_GENERAL_ERROR)); } } @@ -508,8 +512,8 @@ TEST_F(RadioHidlTest, setCellInfoListRate) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -525,7 +529,8 @@ TEST_F(RadioHidlTest, nvReadItem) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -544,7 +549,8 @@ TEST_F(RadioHidlTest, nvWriteItem) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -561,7 +567,8 @@ TEST_F(RadioHidlTest, nvWriteCdmaPrl) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -577,8 +584,8 @@ TEST_F(RadioHidlTest, nvResetConfig) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -596,11 +603,11 @@ TEST_F(RadioHidlTest, setUiccSubscription) { 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); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, + RadioError::MODEM_ERR, RadioError::SUBSCRIPTION_NOT_SUPPORTED}, + CHECK_GENERAL_ERROR)); } } @@ -616,7 +623,8 @@ TEST_F(RadioHidlTest, getHardwareConfig) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -632,7 +640,8 @@ TEST_F(RadioHidlTest, requestShutdown) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -648,7 +657,7 @@ TEST_F(RadioHidlTest, getRadioCapability) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -667,9 +676,9 @@ TEST_F(RadioHidlTest, setRadioCapability) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -685,10 +694,9 @@ TEST_F(RadioHidlTest, startLceService) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED, + RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT})); } } @@ -704,10 +712,9 @@ TEST_F(RadioHidlTest, stopLceService) { 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 || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::LCE_NOT_SUPPORTED, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::SIM_ABSENT})); } } @@ -723,9 +730,10 @@ TEST_F(RadioHidlTest, pullLceData) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() || - radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || - radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INTERNAL_ERR, RadioError::RADIO_NOT_AVAILABLE}, + CHECK_OEM_ERROR)); } } @@ -741,8 +749,8 @@ TEST_F(RadioHidlTest, getModemActivityInfo) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -766,8 +774,8 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } /* Reset back to no carrier restriction */ @@ -781,8 +789,8 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -798,8 +806,8 @@ TEST_F(RadioHidlTest, getAllowedCarriers) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -817,8 +825,8 @@ TEST_F(RadioHidlTest, sendDeviceState) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -836,8 +844,8 @@ TEST_F(RadioHidlTest, setIndicationFilter) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -853,7 +861,7 @@ TEST_F(RadioHidlTest, setSimCardPower) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } 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 7d747030f0..469f03aead 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_sms.cpp @@ -34,10 +34,10 @@ TEST_F(RadioHidlTest, sendSms) { 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::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode); } } @@ -61,10 +61,10 @@ TEST_F(RadioHidlTest, sendSMSExpectMore) { 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::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -83,9 +83,9 @@ TEST_F(RadioHidlTest, acknowledgeLastIncomingGsmSms) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, + CHECK_GENERAL_ERROR)); } } @@ -145,10 +145,10 @@ TEST_F(RadioHidlTest, sendCdmaSms) { 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::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -170,9 +170,9 @@ TEST_F(RadioHidlTest, acknowledgeLastIncomingCdmaSms) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::NO_SMS_TO_ACK}, + CHECK_GENERAL_ERROR)); } } @@ -221,8 +221,8 @@ TEST_F(RadioHidlTest, sendImsSms) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::INVALID_ARGUMENTS}, + CHECK_GENERAL_ERROR)); } } @@ -239,9 +239,10 @@ TEST_F(RadioHidlTest, getSmscAddress) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -259,10 +260,10 @@ TEST_F(RadioHidlTest, setSmscAddress) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_SMS_FORMAT, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -283,15 +284,12 @@ TEST_F(RadioHidlTest, writeSmsToSim) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::ENCODING_ERR, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_SMSC_ADDRESS, RadioError::MODEM_ERR, RadioError::NETWORK_NOT_READY, + RadioError::NO_RESOURCES, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -309,13 +307,12 @@ TEST_F(RadioHidlTest, deleteSmsOnSim) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::ENCODING_ERR, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_MODEM_STATE, RadioError::NO_SUCH_ENTRY, RadioError::MODEM_ERR, + RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -361,15 +358,12 @@ TEST_F(RadioHidlTest, writeSmsToRuim) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_SMS_FORMAT, + RadioError::INVALID_SMSC_ADDRESS, RadioError::INVALID_STATE, RadioError::MODEM_ERR, + RadioError::NO_SUCH_ENTRY, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -416,13 +410,11 @@ TEST_F(RadioHidlTest, deleteSmsOnRuim) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_MODEM_STATE, + RadioError::MODEM_ERR, RadioError::NO_SUCH_ENTRY, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -440,10 +432,9 @@ TEST_F(RadioHidlTest, reportSmsMemoryStatus) { 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::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, + RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } 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 611867adb3..411d74c22b 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp @@ -34,12 +34,10 @@ TEST_F(RadioHidlTest, sendEnvelope) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, + RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -59,11 +57,10 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; - ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -81,10 +78,10 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, + RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } @@ -101,7 +98,8 @@ TEST_F(RadioHidlTest, reportStkServiceIsRunning) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -122,9 +120,9 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 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 || - radioRsp->rspInfo.error == RadioError::SIM_ABSENT); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR, RadioError::SIM_ABSENT}, + CHECK_GENERAL_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 ed2c6bb6ab..da12aa4621 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -65,17 +65,3 @@ std::cv_status RadioHidlTest::wait() { count--; return status; } - -bool RadioHidlTest::CheckGeneralError() { - return (radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - radioRsp->rspInfo.error == RadioError::NO_MEMORY || - radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || - radioRsp->rspInfo.error == RadioError::SYSTEM_ERR || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp->rspInfo.error == RadioError::CANCELLED); -} - -bool RadioHidlTest::CheckOEMError() { - return (radioRsp->rspInfo.error >= RadioError::OEM_ERROR_1 && - radioRsp->rspInfo.error <= RadioError::OEM_ERROR_25); -} diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h index b60887c74b..ab0bd8b1d0 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h @@ -529,12 +529,6 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { /* Test code calls this function to wait for response */ std::cv_status wait(); - /* Used for checking General Errors */ - bool CheckGeneralError(); - - /* Used for checking OEM Errors */ - bool CheckOEMError(); - sp radio; sp radioRsp; sp radioInd; 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 1d2f199de0..b3d56480c1 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp @@ -28,7 +28,7 @@ TEST_F(RadioHidlTest, getCurrentCalls) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -48,18 +48,14 @@ TEST_F(RadioHidlTest, dial) { 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::OPERATION_NOT_ALLOWED || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::CANCELLED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::CANCELLED, RadioError::DEVICE_IN_USE, RadioError::FDN_CHECK_FAILURE, + RadioError::INVALID_ARGUMENTS, RadioError::INVALID_CALL_ID, + RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE, RadioError::MODEM_ERR, + RadioError::NO_NETWORK_FOUND, RadioError::NO_SUBSCRIPTION, + RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } @@ -75,10 +71,10 @@ TEST_F(RadioHidlTest, hangup) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -94,8 +90,9 @@ TEST_F(RadioHidlTest, hangupWaitingOrBackground) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -111,8 +108,9 @@ TEST_F(RadioHidlTest, hangupForegroundResumeBackground) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -128,8 +126,9 @@ TEST_F(RadioHidlTest, switchWaitingOrHoldingAndActive) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -145,8 +144,9 @@ TEST_F(RadioHidlTest, conference) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -162,8 +162,9 @@ TEST_F(RadioHidlTest, rejectCall) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -179,7 +180,8 @@ TEST_F(RadioHidlTest, getLastCallFailCause) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR)); } } @@ -194,10 +196,10 @@ TEST_F(RadioHidlTest, sendUssd) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -213,9 +215,10 @@ TEST_F(RadioHidlTest, cancelPendingUssd) { 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 || - radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -234,10 +237,10 @@ TEST_F(RadioHidlTest, getCallForwardStatus) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -256,10 +259,10 @@ TEST_F(RadioHidlTest, setCallForward) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -275,10 +278,10 @@ TEST_F(RadioHidlTest, getCallWaiting) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -294,10 +297,10 @@ TEST_F(RadioHidlTest, setCallWaiting) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -313,8 +316,9 @@ TEST_F(RadioHidlTest, acceptCall) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -330,10 +334,10 @@ TEST_F(RadioHidlTest, separateConnection) { 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); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -349,8 +353,9 @@ TEST_F(RadioHidlTest, explicitCallTransfer) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -366,14 +371,11 @@ TEST_F(RadioHidlTest, sendCDMAFeatureCode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; - 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 || - radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_CALL_ID, RadioError::INVALID_MODEM_STATE, + RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } @@ -389,12 +391,11 @@ TEST_F(RadioHidlTest, sendDtmf) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_CALL_ID, + RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -410,12 +411,11 @@ TEST_F(RadioHidlTest, startDtmf) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_CALL_ID, + RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -431,10 +431,10 @@ TEST_F(RadioHidlTest, stopDtmf) { 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 || - radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_CALL_ID, + RadioError::INVALID_MODEM_STATE, RadioError::MODEM_ERR}, + CHECK_GENERAL_ERROR)); } } @@ -450,9 +450,9 @@ TEST_F(RadioHidlTest, setMute) { 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); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::NONE, RadioError::INVALID_ARGUMENTS}, + CHECK_GENERAL_ERROR)); } } @@ -468,7 +468,7 @@ TEST_F(RadioHidlTest, getMute) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); } } @@ -484,10 +484,9 @@ TEST_F(RadioHidlTest, sendBurstDtmf) { 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::OPERATION_NOT_ALLOWED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, + RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED}, + CHECK_GENERAL_ERROR)); } } \ No newline at end of file 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 bb614879af..d0788ddeed 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_api.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_api.cpp @@ -51,10 +51,10 @@ TEST_F(SapHidlTest, apduReq) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); - 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); + ASSERT_TRUE( + CheckAnyOfErrors(sapCb->sapResultCode, + {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_ALREADY_POWERED_OFF, + SapResultCode::CARD_NOT_ACCESSSIBLE, SapResultCode::CARD_REMOVED})); } /* @@ -67,10 +67,10 @@ TEST_F(SapHidlTest, transferAtrReq) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); - 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); + ASSERT_TRUE( + CheckAnyOfErrors(sapCb->sapResultCode, + {SapResultCode::GENERIC_FAILURE, SapResultCode::DATA_NOT_AVAILABLE, + SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED})); } /* @@ -84,11 +84,10 @@ TEST_F(SapHidlTest, powerReq) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); - 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); + ASSERT_TRUE(CheckAnyOfErrors( + sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_NOT_ACCESSSIBLE, + SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED, + SapResultCode::CARD_ALREADY_POWERED_ON})); } /* @@ -101,10 +100,10 @@ TEST_F(SapHidlTest, resetSimReq) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); - 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); + ASSERT_TRUE( + CheckAnyOfErrors(sapCb->sapResultCode, + {SapResultCode::GENERIC_FAILURE, SapResultCode::CARD_NOT_ACCESSSIBLE, + SapResultCode::CARD_ALREADY_POWERED_OFF, SapResultCode::CARD_REMOVED})); } /* @@ -117,8 +116,8 @@ TEST_F(SapHidlTest, transferCardReaderStatusReq) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(sapCb->sapResponseToken, token); - ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode || - SapResultCode::DATA_NOT_AVAILABLE == sapCb->sapResultCode); + ASSERT_TRUE(CheckAnyOfErrors( + sapCb->sapResultCode, {SapResultCode::GENERIC_FAILURE, SapResultCode::DATA_NOT_AVAILABLE})); } /* diff --git a/radio/1.0/vts/functional/vts_test_util.cpp b/radio/1.0/vts/functional/vts_test_util.cpp index c6d1f9f137..ec96e5fb15 100644 --- a/radio/1.0/vts/functional/vts_test_util.cpp +++ b/radio/1.0/vts/functional/vts_test_util.cpp @@ -15,8 +15,42 @@ */ #include #include -using namespace std; int GetRandomSerialNumber() { return rand(); +} + +::testing::AssertionResult CheckAnyOfErrors(RadioError err, std::vector errors, + CheckFlag flag) { + const static vector generalErrors = { + RadioError::RADIO_NOT_AVAILABLE, RadioError::NO_MEMORY, + RadioError::INTERNAL_ERR, RadioError::SYSTEM_ERR, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::CANCELLED}; + if (flag == CHECK_GENERAL_ERROR || flag == CHECK_OEM_AND_GENERAL_ERROR) { + for (size_t i = 0; i < generalErrors.size(); i++) { + if (err == generalErrors[i]) { + return testing::AssertionSuccess(); + } + } + } + if (flag == CHECK_OEM_ERROR || flag == CHECK_OEM_AND_GENERAL_ERROR) { + if (err >= RadioError::OEM_ERROR_1 && err <= RadioError::OEM_ERROR_25) { + return testing::AssertionSuccess(); + } + } + for (size_t i = 0; i < errors.size(); i++) { + if (err == errors[i]) { + return testing::AssertionSuccess(); + } + } + return testing::AssertionFailure() << "RadioError:" + toString(err) + " is returned"; +} + +::testing::AssertionResult CheckAnyOfErrors(SapResultCode err, std::vector errors) { + for (size_t i = 0; i < errors.size(); i++) { + if (err == errors[i]) { + return testing::AssertionSuccess(); + } + } + return testing::AssertionFailure() << "SapError:" + toString(err) + " is returned"; } \ 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 index 939013f49f..3bca4509ce 100644 --- a/radio/1.0/vts/functional/vts_test_util.h +++ b/radio/1.0/vts/functional/vts_test_util.h @@ -14,4 +14,37 @@ * limitations under the License. */ -int GetRandomSerialNumber(); \ No newline at end of file +#include + +#include + +#include + +using ::android::hardware::radio::V1_0::RadioError; +using ::android::hardware::radio::V1_0::SapResultCode; +using namespace std; + +enum CheckFlag { + CHECK_DEFAULT = 0, + CHECK_GENERAL_ERROR = 1, + CHECK_OEM_ERROR = 2, + CHECK_OEM_AND_GENERAL_ERROR = 3, + CHECK_SAP_ERROR = 4, +}; + +/* + * Generate random serial number for radio test + */ +int GetRandomSerialNumber(); + +/* + * Check multiple radio error codes which are possibly returned because of the different + * vendor/devices implementations. It allows optional checks for general errors or/and oem errors. + */ +::testing::AssertionResult CheckAnyOfErrors(RadioError err, std::vector generalError, + CheckFlag flag = CHECK_DEFAULT); +/* + * Check multiple sap error codes which are possibly returned because of the different + * vendor/devices implementations. + */ +::testing::AssertionResult CheckAnyOfErrors(SapResultCode err, std::vector errors); \ No newline at end of file diff --git a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp index 10f8f62a50..17c2a83739 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp @@ -29,10 +29,10 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) { EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE})); } } @@ -63,11 +63,10 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan) { if (cardStatus.cardState == CardState::ABSENT) { ALOGI("startNetworkScan, rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error); - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || - radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp_v1_1->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_1->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS, + RadioError::SIM_ABSENT, RadioError::OPERATION_NOT_ALLOWED})); } } @@ -89,9 +88,9 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan_InvalidArgument) { if (cardStatus.cardState == CardState::ABSENT) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error); - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::SIM_ABSENT, + RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -108,9 +107,9 @@ TEST_F(RadioHidlTest_v1_1, stopNetworkScan) { if (cardStatus.cardState == CardState::ABSENT) { ALOGI("stopNetworkScan rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error); - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || - radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_1->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -132,8 +131,8 @@ TEST_F(RadioHidlTest_v1_1, setCarrierInfoForImsiEncryption) { EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -229,8 +228,9 @@ TEST_F(RadioHidlTest_v1_1, startKeepalive) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_1->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -245,6 +245,7 @@ TEST_F(RadioHidlTest_v1_1, stopKeepalive) { EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_1->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial); - ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } diff --git a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp index e0b1ad4bc9..451027d5d9 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_test.cpp @@ -65,18 +65,4 @@ std::cv_status RadioHidlTest_v1_1::wait() { } count--; return status; -} - -bool RadioHidlTest_v1_1::CheckGeneralError() { - return (radioRsp_v1_1->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || - radioRsp_v1_1->rspInfo.error == RadioError::NO_MEMORY || - radioRsp_v1_1->rspInfo.error == RadioError::INTERNAL_ERR || - radioRsp_v1_1->rspInfo.error == RadioError::SYSTEM_ERR || - radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp_v1_1->rspInfo.error == RadioError::CANCELLED); -} - -bool RadioHidlTest_v1_1::CheckOEMError() { - return (radioRsp_v1_1->rspInfo.error >= RadioError::OEM_ERROR_1 && - radioRsp_v1_1->rspInfo.error <= RadioError::OEM_ERROR_25); -} +} \ No newline at end of file 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 a4f3571520..64a598a165 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -43,13 +43,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::NONE || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -72,12 +72,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } } @@ -109,14 +110,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -148,14 +150,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -187,14 +190,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -226,14 +230,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -265,14 +270,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -304,14 +310,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, + RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -343,14 +350,14 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::NONE || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::NONE || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } } @@ -383,13 +390,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::NONE || - radioRsp_v1_2->rspInfo.error == RadioError::SIM_ABSENT || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(radioRsp_v1_2->rspInfo.error == RadioError::NONE || - radioRsp_v1_2->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || - radioRsp_v1_2->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::OPERATION_NOT_ALLOWED})); } }