tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Backport VTS fixes to previous test versions

Browse source 
Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
Merged-In: I77e0706f413ce9defb174f00ee145dcc01f5d780
This commit is contained in:
Sarah Chin 2023-04-27 14:01:34 -07:00
parent f9ce76989c
commit 8ab8f0d1d8
5 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
radio/1.0/vts/functional/radio_hidl_hal_data.cpp
View file

@ -87,12 +87,19 @@ TEST_P(RadioHidlTest, getDataRegistrationState) {
cellIdentities.cellIdentityTdscdma.size());
if (checkMccMnc) {
// 32 bit system gets result: "\xff\xff\xff..." from RIL, which is not testable. Only
// test for 64 bit here. TODO: remove this limit after b/113181277 being fixed.
if (hidl_mcc.size() < 4 && hidl_mnc.size() < 4) {
// 32 bit system gets result: "\xff\xff\xff..." from RIL, which is not testable.
// Only test for 64 bit here. TODO: remove this limit after b/113181277 being fixed.
int mccSize = hidl_mcc.size();
EXPECT_TRUE(mccSize == 0 || mccSize == 3);
if (mccSize > 0) {
int mcc = stoi(hidl_mcc);
int mnc = stoi(hidl_mnc);
EXPECT_TRUE(mcc >= 0 && mcc <= 999);
}
int mncSize = hidl_mnc.size();
EXPECT_TRUE(mncSize == 0 || mncSize == 2 || mncSize == 3);
if (mncSize > 0) {
int mnc = stoi(hidl_mnc);
EXPECT_TRUE(mnc >= 0 && mnc <= 999);
}
}

23
radio/1.2/vts/functional/radio_hidl_hal_api.cpp
View file

@ -120,7 +120,7 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) {
serial = GetRandomSerialNumber();
::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 4,
.specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60,
@ -155,7 +155,7 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) {
serial = GetRandomSerialNumber();
::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 301,
.specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60,
@ -821,11 +821,20 @@ TEST_P(RadioHidlTest_v1_2, getDataRegistrationState) {
cellIdentities.cellIdentityTdscdma.size());
// 32 bit system might return invalid mcc and mnc hidl string "\xff\xff..."
if (checkMccMnc && hidl_mcc.size() < 4 && hidl_mnc.size() < 4) {
int mcc = stoi(hidl_mcc);
int mnc = stoi(hidl_mnc);
EXPECT_TRUE(mcc >= 0 && mcc <= 999);
EXPECT_TRUE(mnc >= 0 && mnc <= 999);
if (checkMccMnc) {
int mccSize = hidl_mcc.size();
EXPECT_TRUE(mccSize == 0 || mccSize == 3);
if (mccSize > 0) {
int mcc = stoi(hidl_mcc);
EXPECT_TRUE(mcc >= 0 && mcc <= 999);
}
int mncSize = hidl_mnc.size();
EXPECT_TRUE(mncSize == 0 || mncSize == 2 || mncSize == 3);
if (mncSize > 0) {
int mnc = stoi(hidl_mnc);
EXPECT_TRUE(mnc >= 0 && mnc <= 999);
}
}
}

4
radio/1.4/vts/functional/radio_hidl_hal_api.cpp
View file

@ -335,7 +335,7 @@ TEST_P(RadioHidlTest_v1_4, startNetworkScan_InvalidInterval1) {
serial = GetRandomSerialNumber();
::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 4,
.specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60,
@ -368,7 +368,7 @@ TEST_P(RadioHidlTest_v1_4, startNetworkScan_InvalidInterval2) {
serial = GetRandomSerialNumber();
::android::hardware::radio::V1_2::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 301,
.specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},
.maxSearchTime = 60,

4
radio/1.5/vts/functional/radio_hidl_hal_api.cpp
View file

@ -661,7 +661,7 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan_InvalidInterval1) {
.channels = {128, 129}};
::android::hardware::radio::V1_5::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 4,
.specifiers = {specifierP900, specifier850},
.maxSearchTime = 60,
@ -705,7 +705,7 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan_InvalidInterval2) {
.channels = {128, 129}};
::android::hardware::radio::V1_5::NetworkScanRequest request = {
.type = ScanType::ONE_SHOT,
.type = ScanType::PERIODIC,
.interval = 301,
.specifiers = {specifierP900, specifier850},
.maxSearchTime = 60,

19
radio/aidl/vts/radio_network_test.cpp
View file

@ -1497,11 +1497,20 @@ TEST_P(RadioNetworkTest, getDataRegistrationState) {
}
// 32 bit system might return invalid mcc and mnc string "\xff\xff..."
if (checkMccMnc && mcc.size() == 3 && (mnc.size() == 2 || mnc.size() == 3)) {
int mcc_int = stoi(mcc);
int mnc_int = stoi(mnc);
EXPECT_TRUE(mcc_int >= 0 && mcc_int <= 999);
EXPECT_TRUE(mnc_int >= 0 && mnc_int <= 999);
if (checkMccMnc) {
int mccSize = mcc.size();
EXPECT_TRUE(mccSize == 0 || mccSize == 3);
if (mccSize > 0) {
int mcc_int = stoi(mcc);
EXPECT_TRUE(mcc_int >= 0 && mcc_int <= 999);
}
int mncSize = mnc.size();
EXPECT_TRUE(mncSize == 0 || mncSize == 2 || mncSize == 3);
if (mncSize > 0) {
int mnc_int = stoi(mnc);
EXPECT_TRUE(mnc_int >= 0 && mnc_int <= 999);
}
}
// Check for access technology specific info