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

resolve merge conflicts of 345a396c to oc-dr1-dev

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
This commit is contained in:
sqian
2017-08-01 12:21:55 -07:00
parent ec37054b9e 345a396c18
commit a6e57a9647
2 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,7 +397,8 @@ TEST_F(RadioHidlTest, getDeviceIdentity) {
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::EMPTY_RECORD);
}
}

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

@@ -40,24 +40,6 @@ TEST_F(RadioHidlTest, sendEnvelope) {
radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR);
}
// Test with sending random string
serial = GetRandomSerialNumber();
content = "0";
radio->sendEnvelope(serial, content);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
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::NONE ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR);
}
}
/*
@@ -81,23 +63,6 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) {
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::NONE);
}
serial = GetRandomSerialNumber();
// Test with sending random string
commandResponse = "0";
radio->sendTerminalResponseToSim(serial, commandResponse);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
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);
}
}
/*
@@ -159,21 +124,4 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) {
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
}
// Test with sending random string
serial = GetRandomSerialNumber();
contents = "0";
radio->sendEnvelopeWithStatus(serial, contents);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
}
}