Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8b8b6b1 authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

Patch for setSimCardPower_1_1

Do not expect its affect on cardStatus if it is not successfully returned.
Check the response error before updating sim card status.

Test: sanity
Bug: 111661946
Change-Id: I48551f5469289b9fcfc47dd9fd2e455779640329
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
(cherry picked from commit 7e787e192cd4700d8f4e7cc5f55501bc37590245)
parent c1db4227
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) {
    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error,
                                 {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,
                                  RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE}));
    if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
        /* Wait some time for setting sim power down and then verify it */
        updateSimCardStatus();
        auto startTime = std::chrono::system_clock::now();
@@ -43,7 +44,6 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) {
            sleep(2);
            updateSimCardStatus();
        }
    if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
        EXPECT_EQ(CardState::ABSENT, cardStatus.cardState);
    }

@@ -65,7 +65,7 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) {
        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();
        auto startTime = std::chrono::system_clock::now();
        while (cardStatus.cardState != CardState::PRESENT &&
               std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
                                                           startTime)