From c02dd2562ff373c32740b1fda5947a5861d73990 Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 20 Jul 2018 16:33:16 -0700 Subject: [PATCH] Fix setSimCardPower_1_1 If the function isn't executed successfully, do not expect its effect of cardStatus. Bug: 111661946 Test: run vts Change-Id: I952728311b595149b449280e73142f2f82af544d Merged-In: I952728311b595149b449280e73142f2f82af544d (cherry picked from commit 934243085ae70d7ce4ec7f6ee331099b4566b051) --- radio/1.1/vts/functional/radio_hidl_hal_api.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 90077dcf61..40759a6efd 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp @@ -43,7 +43,9 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) { sleep(2); updateSimCardStatus(); } - EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); + if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) { + EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); + } /* Test setSimCardPower power up */ serial = GetRandomSerialNumber(); @@ -59,7 +61,8 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) { * If the sim card status for the testing environment is PRESENT, * verify if sim status is reset back. */ - if (cardStateForTest == CardState::PRESENT) { + if (cardStateForTest == CardState::PRESENT && + radioRsp_v1_1->rspInfo.error == RadioError::NONE) { /* Wait some time for resetting back to sim power on and then verify it */ updateSimCardStatus(); startTime = std::chrono::system_clock::now();