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

Commit d46cee4a authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add GENERIC_FAILURE error checks for some Radio BTSAP Apis which are failing" into oc-dev 

am: 79c636a4

Change-Id: I81fc971a9a36550c254999222bdc669dd234b558
parents c86120fb 79c636a4

radio/1.0/vts/functional/sap_hidl_hal_api.cpp

+8 −4
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ TEST_F(SapHidlTest, transferAtrReq) { 
  EXPECT_EQ(std::cv_status::no_timeout, wait());

  EXPECT_EQ(sapCb->sapResponseToken, token);



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

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

}
@@ -82,7 +83,8 @@ TEST_F(SapHidlTest, powerReq) { 
  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 ||

              SapResultCode::CARD_ALREADY_POWERED_ON == sapCb->sapResultCode);
@@ -98,7 +100,8 @@ TEST_F(SapHidlTest, resetSimReq) { 
  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);

}
@@ -113,7 +116,8 @@ TEST_F(SapHidlTest, transferCardReaderStatusReq) { 
  EXPECT_EQ(std::cv_status::no_timeout, wait());

  EXPECT_EQ(sapCb->sapResponseToken, token);



  EXPECT_EQ(SapResultCode::DATA_NOT_AVAILABLE, sapCb->sapResultCode);

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

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

}



/*