From 48124dac556f4c6cfa29cbb6dde5b622cb6fadca Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 23 Jun 2017 16:37:32 -0700 Subject: [PATCH] Fix failure vts tests: - setCdmaBroadcastConfig - getCdmaBroadcastConfig - setCdmaBroadcastActivation - pullLceData - setAllowedCarriers - setAllowedCarriers - sendEnvelope - sendEnvelopeWithStatus - cancelPendingUssd - sendCDMAFeatureCode Test: mma -j30; adb shell binary Bug: 62960543, 62584347 Change-Id: Ie907cdb464a44d92be47d898151d71eb2d83a11c Merged-In: Ie907cdb464a44d92be47d898151d71eb2d83a11c --- .../vts/functional/radio_hidl_hal_cell_broadcast.cpp | 8 +++++--- radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 11 ++++++----- radio/1.0/vts/functional/radio_hidl_hal_stk.cpp | 12 ++++++++---- radio/1.0/vts/functional/radio_hidl_hal_voice.cpp | 6 ++++-- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp index 14d14d42bd..e0c3a158d2 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp @@ -123,7 +123,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE); } } @@ -140,7 +141,7 @@ TEST_F(RadioHidlTest, getCdmaBroadcastConfig) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError()); + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); } } @@ -159,7 +160,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::NONE); } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index 69da6b2900..05d82f0a4e 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -184,7 +184,7 @@ TEST_F(RadioHidlTest, setBandMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); } } @@ -216,7 +216,7 @@ TEST_F(RadioHidlTest, setPreferredNetworkType) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE); } } @@ -705,7 +705,8 @@ TEST_F(RadioHidlTest, pullLceData) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() || - radioRsp->rspInfo.error == RadioError::INTERNAL_ERR); + radioRsp->rspInfo.error == RadioError::INTERNAL_ERR || + radioRsp->rspInfo.error == RadioError::NONE); } } @@ -745,7 +746,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || CheckGeneralError()); } /* Reset back to no carrier restriction */ @@ -759,7 +760,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || CheckGeneralError()); } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp index 6ff033032e..9a9a4aee99 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp @@ -37,7 +37,8 @@ TEST_F(RadioHidlTest, sendEnvelope) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE); + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); } // Test with sending random string @@ -54,7 +55,8 @@ TEST_F(RadioHidlTest, sendEnvelope) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE); + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); } } @@ -153,7 +155,8 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); } // Test with sending random string @@ -168,6 +171,7 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::MODEM_ERR); } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp index 8fe04fd874..e1c3700bef 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp @@ -214,7 +214,8 @@ TEST_F(RadioHidlTest, cancelPendingUssd) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::NONE); } } @@ -370,7 +371,8 @@ TEST_F(RadioHidlTest, sendCDMAFeatureCode) { radioRsp->rspInfo.error == RadioError::NONE || radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED); } }