Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vts tests:

Browse Source 
- setCdmaSubscriptionSource
- nvReadItem
- nvWriteItem
- nvWriteCdmaPrl
- getHardwareConfig
- sendEnvelope
- sendTerminalResponseToSim

Will update .hal file seperately.

Test: adb shell <vts_binary>
Bug: 35671595
Bug: 35800570
Change-Id: I651af50f122f37721778b1088df40fa6e12ac6e4
This commit is contained in:
sqian
2017-06-09 18:01:29 -07:00
parent 7e4b5758b7
commit a009cd5b03
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
View File

@@ -441,8 +441,10 @@ TEST_F(RadioHidlTest, setCdmaSubscriptionSource) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE);
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp->rspInfo.error == RadioError::SUBSCRIPTION_NOT_AVAILABLE ||
radioRsp->rspInfo.error == RadioError::NONE);
}
}
@@ -508,7 +510,7 @@ TEST_F(RadioHidlTest, nvReadItem) {
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);
}
}
@@ -527,7 +529,7 @@ TEST_F(RadioHidlTest, nvWriteItem) {
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);
}
}
@@ -544,7 +546,7 @@ TEST_F(RadioHidlTest, nvWriteCdmaPrl) {
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);
}
}
@@ -598,7 +600,7 @@ TEST_F(RadioHidlTest, getHardwareConfig) {
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);
}
}

14
radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
View File

@@ -34,8 +34,10 @@ TEST_F(RadioHidlTest, sendEnvelope) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::NONE);
}
// Test with sending random string
@@ -49,8 +51,10 @@ TEST_F(RadioHidlTest, sendEnvelope) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::NONE);
}
}
@@ -70,7 +74,10 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::NONE);
}
serial = GetRandomSerialNumber();
@@ -85,6 +92,7 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) {
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
}