Fix some VTS for 2017 devices
- sendDeviceState - setIndicationFilter Mentioned in b/63148938 - getNeighboringCids Add Request_not_support for Apis mentioned in Bugs: - 62989786 - 62986286 - 62987946 Test: run vts Bug: 63130111 Bug: 63148938 Bug: 62989786 Bug: 62986286 Bug: 62987946 Change-Id: Ib51f67d403bb27f409018a98c07d6aa6aa6d19f8 Merged-In: Ib51f67d403bb27f409018a98c07d6aa6aa6d19f8 (cherry picked from commitfe0699535e
) (cherry picked from commitc699ba3901
)
This commit is contained in:
parent
43e1c6bc55
commit
44bd0bb4f4
1 changed files with 27 additions and 14 deletions
|
@ -248,7 +248,8 @@ TEST_F(RadioHidlTest, getNeighboringCids) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -280,7 +281,8 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -345,7 +347,8 @@ TEST_F(RadioHidlTest, setPreferredVoicePrivacy) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -361,7 +364,8 @@ TEST_F(RadioHidlTest, getPreferredVoicePrivacy) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -494,7 +498,8 @@ TEST_F(RadioHidlTest, setCellInfoListRate) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -562,7 +567,8 @@ TEST_F(RadioHidlTest, nvResetConfig) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -690,7 +696,8 @@ TEST_F(RadioHidlTest, stopLceService) {
|
|||
|
||||
if (cardStatus.cardState == CardState::ABSENT) {
|
||||
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
|
||||
radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED);
|
||||
radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -723,7 +730,8 @@ TEST_F(RadioHidlTest, getModemActivityInfo) {
|
|||
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 ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -777,7 +785,8 @@ TEST_F(RadioHidlTest, getAllowedCarriers) {
|
|||
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
|
||||
|
||||
if (cardStatus.cardState == CardState::ABSENT) {
|
||||
EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
|
||||
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -792,9 +801,11 @@ TEST_F(RadioHidlTest, sendDeviceState) {
|
|||
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
|
||||
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
|
||||
|
||||
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
|
||||
|
||||
if (cardStatus.cardState == CardState::ABSENT) {
|
||||
ASSERT_TRUE(CheckGeneralError() ||
|
||||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
|
||||
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -809,9 +820,11 @@ TEST_F(RadioHidlTest, setIndicationFilter) {
|
|||
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
|
||||
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
|
||||
|
||||
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
|
||||
|
||||
if (cardStatus.cardState == CardState::ABSENT) {
|
||||
ASSERT_TRUE(CheckGeneralError() ||
|
||||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
|
||||
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
|
||||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue