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

Commit 786ddd53 authored by sqian's avatar sqian
Browse files

Fix vts tests 

- apduReq

(with QC UIM document)
- handleStkCallSetupRequestFromSim
- supplyNetworkDepersonalization

Test: make vts; vts-tradefed; run vts -m VtsHalRadioV1_0Target
Bug: 35671595
Change-Id: Ie7427e027eb93e89a9790260cfdbbb2d01c50cc1
parent f0b981a4

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+7 −2
Original line number Diff line number Diff line
@@ -318,8 +318,13 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { 
  EXPECT_EQ(serial, radioRsp->rspInfo.serial);



  if (cardStatus.cardState == CardState::ABSENT) {

      ASSERT_TRUE(CheckGeneralError() ||

      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::PASSWORD_INCORRECT);

                  radioRsp->rspInfo.error == RadioError::INVALID_SIM_STATE ||

                  radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT ||

                  radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);

  }

}

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

+6 −1
Original line number Diff line number Diff line
@@ -98,7 +98,12 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) { 
  EXPECT_EQ(serial, radioRsp->rspInfo.serial);



  if (cardStatus.cardState == CardState::ABSENT) {

    EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);

      ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                  radioRsp->rspInfo.error == RadioError::SYSTEM_ERR ||

                  radioRsp->rspInfo.error == RadioError::NO_MEMORY ||

                  radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                  radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                  radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);

  }

}

radio/1.0/vts/functional/sap_hidl_hal_api.cpp

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ TEST_F(SapHidlTest, apduReq) { 
  EXPECT_EQ(std::cv_status::no_timeout, wait());

  EXPECT_EQ(sapCb->sapResponseToken, token);



  ASSERT_TRUE(SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode ||

  ASSERT_TRUE(SapResultCode::GENERIC_FAILURE == sapCb->sapResultCode ||

              SapResultCode::CARD_NOT_ACCESSSIBLE == sapCb->sapResultCode ||

              SapResultCode::CARD_ALREADY_POWERED_OFF == sapCb->sapResultCode ||

              SapResultCode::CARD_REMOVED == sapCb->sapResultCode);

}