From 92bb3ae7b90c2145f94b7fd349219b59af0cd74c Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Thu, 9 May 2019 18:42:37 -0700 Subject: [PATCH] Use Widely Supported GSM Channels for NetworkScan Change the network scan tests to use the P900 and 850 GSM bands, which are commonly (nearly universally) supported bands. Bug: 132076611 Test: atest RadioHidlTest_v1_2 Change-Id: Icb4dc47360a5753b9697f74aec19045155ee27fc --- .../1.2/vts/functional/radio_hidl_hal_api.cpp | 164 +++++++----------- 1 file changed, 65 insertions(+), 99 deletions(-) diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp index 730d9696aa..d4b0675061 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -19,19 +19,25 @@ #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) +namespace { +const RadioAccessSpecifier GERAN_SPECIFIER_P900 = {.radioAccessNetwork = RadioAccessNetworks::GERAN, + .geranBands = {GeranBands::BAND_P900}, + .channels = {512, 513}}; +const RadioAccessSpecifier GERAN_SPECIFIER_850 = {.radioAccessNetwork = RadioAccessNetworks::GERAN, + .geranBands = {GeranBands::BAND_850}, + .channels = {128, 129}}; +} // namespace + /* * Test IRadio.startNetworkScan() for the response returned. */ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, .interval = 60, .specifiers = {specifier}}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -89,18 +95,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 4, - .specifiers = {specifier}, - .maxSearchTime = 60, - .incrementalResults = false, - .incrementalResultsPeriodicity = 1}; + .type = ScanType::ONE_SHOT, + .interval = 4, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 60, + .incrementalResults = false, + .incrementalResultsPeriodicity = 1}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -126,18 +127,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 301, - .specifiers = {specifier}, - .maxSearchTime = 60, - .incrementalResults = false, - .incrementalResultsPeriodicity = 1}; + .type = ScanType::ONE_SHOT, + .interval = 301, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 60, + .incrementalResults = false, + .incrementalResultsPeriodicity = 1}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -163,18 +159,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - .maxSearchTime = 59, - .incrementalResults = false, - .incrementalResultsPeriodicity = 1}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 59, + .incrementalResults = false, + .incrementalResultsPeriodicity = 1}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -200,18 +191,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - .maxSearchTime = 3601, - .incrementalResults = false, - .incrementalResultsPeriodicity = 1}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 3601, + .incrementalResults = false, + .incrementalResultsPeriodicity = 1}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -237,18 +223,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - .maxSearchTime = 600, - .incrementalResults = false, - .incrementalResultsPeriodicity = 0}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 600, + .incrementalResults = false, + .incrementalResultsPeriodicity = 0}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -274,18 +255,13 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - .maxSearchTime = 600, - .incrementalResults = false, - .incrementalResultsPeriodicity = 11}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + .maxSearchTime = 600, + .incrementalResults = false, + .incrementalResultsPeriodicity = 11}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -311,20 +287,15 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - // Some vendor may not support max search time of 360s. - // This issue is tracked in b/112205669. - .maxSearchTime = 300, - .incrementalResults = false, - .incrementalResultsPeriodicity = 10}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + // Some vendor may not support max search time of 360s. + // This issue is tracked in b/112205669. + .maxSearchTime = 300, + .incrementalResults = false, + .incrementalResultsPeriodicity = 10}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res); @@ -350,21 +321,16 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifier specifier = { - .radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1,2}}; - ::android::hardware::radio::V1_2::NetworkScanRequest request = { - .type = ScanType::ONE_SHOT, - .interval = 60, - .specifiers = {specifier}, - // Some vendor may not support max search time of 360s. - // This issue is tracked in b/112205669. - .maxSearchTime = 300, - .incrementalResults = false, - .incrementalResultsPeriodicity = 10, - .mccMncs = {"310410"}}; + .type = ScanType::ONE_SHOT, + .interval = 60, + .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850}, + // Some vendor may not support max search time of 360s. + // This issue is tracked in b/112205669. + .maxSearchTime = 300, + .incrementalResults = false, + .incrementalResultsPeriodicity = 10, + .mccMncs = {"310410"}}; Return res = radio_v1_2->startNetworkScan_1_2(serial, request); ASSERT_OK(res);