From 153a84ef1132ba0a7dcb0a0db60bd18ae20be0cc Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 5 May 2017 12:51:56 -0700 Subject: [PATCH] Add GENERIC_FAILURE error checks for some Radio BTSAP Apis which are failing Test: Vts Bug: 35671595 Change-Id: Ie2ca86437283ce2f8e4b5cad21454a8d201e53ad --- radio/1.0/vts/functional/sap_hidl_hal_api.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 682230c89a..e166209254 100644 --- a/radio/1.0/vts/functional/sap_hidl_hal_api.cpp +++ b/radio/1.0/vts/functional/sap_hidl_hal_api.cpp @@ -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); } /*