diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index 6423329022..303dc7745e 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -24,6 +24,19 @@ #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk()) +namespace { +const RadioAccessSpecifierBands EUTRAN_BAND_17 = + RadioAccessSpecifierBands::make( + {EutranBands::BAND_17}); +const RadioAccessSpecifierBands EUTRAN_BAND_20 = + RadioAccessSpecifierBands::make( + {EutranBands::BAND_20}); +const RadioAccessSpecifier EUTRAN_SPECIFIER_17 = { + .accessNetwork = AccessNetwork::EUTRAN, .bands = EUTRAN_BAND_17, .channels = {1, 2}}; +const RadioAccessSpecifier EUTRAN_SPECIFIER_20 = { + .accessNetwork = AccessNetwork::EUTRAN, .bands = EUTRAN_BAND_20, .channels = {128, 129}}; +} // namespace + void RadioNetworkTest::SetUp() { std::string serviceName = GetParam(); @@ -291,7 +304,7 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_invalidHysteresisDb) signalThresholdInfo.hysteresisDb = 10; // hysteresisDb too large given threshold list deltas signalThresholdInfo.thresholds = {-109, -103, -97, -89}; signalThresholdInfo.isEnabled = true; - signalThresholdInfo.ran = AccessNetwork::GERAN; + signalThresholdInfo.ran = AccessNetwork::EUTRAN; ndk::ScopedAStatus res = radio_network->setSignalStrengthReportingCriteria(serial, {signalThresholdInfo}); @@ -316,7 +329,7 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_EmptyThresholds) { signalThresholdInfo.hysteresisMs = 0; signalThresholdInfo.hysteresisDb = 0; signalThresholdInfo.isEnabled = true; - signalThresholdInfo.ran = AccessNetwork::GERAN; + signalThresholdInfo.ran = AccessNetwork::EUTRAN; ndk::ScopedAStatus res = radio_network->setSignalStrengthReportingCriteria(serial, {signalThresholdInfo}); @@ -353,7 +366,8 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Geran) { ALOGI("setSignalStrengthReportingCriteria_Geran, rspInfo.error = %s\n", toString(radioRsp_network->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::NONE})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } /* @@ -652,7 +666,7 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_multiRansPerRequest) ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); if (radioRsp_network->rspInfo.error == RadioError::NONE) { - supportedSignalThresholdInfos.push_back(signalThresholdInfoGeran); + supportedSignalThresholdInfos.push_back(signalThresholdInfoEutran); } else { // Refer to IRadioNetworkResponse#setSignalStrengthReportingCriteriaResponse ASSERT_TRUE(CheckAnyOfErrors( @@ -686,7 +700,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisDlKbp ndk::ScopedAStatus res = radio_network->setLinkCapacityReportingCriteria( serial, 5000, 5000, // hysteresisDlKbps too big for thresholds delta - 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, AccessNetwork::GERAN); + 100, {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, AccessNetwork::EUTRAN); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); @@ -694,11 +708,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisDlKbp ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisDlKbps, rspInfo.error = %s\n", toString(radioRsp_network->rspInfo.error).c_str()); - // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported - // for GERAN - ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } /* @@ -709,7 +719,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisUlKbp ndk::ScopedAStatus res = radio_network->setLinkCapacityReportingCriteria( serial, 5000, 500, 1000, // hysteresisUlKbps too big for thresholds delta - {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, AccessNetwork::GERAN); + {1000, 5000, 10000, 20000}, {500, 1000, 5000, 10000}, AccessNetwork::EUTRAN); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); @@ -717,11 +727,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisUlKbp ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", toString(radioRsp_network->rspInfo.error).c_str()); - // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported - // for GERAN - ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } /* @@ -731,7 +737,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_emptyParams) { serial = GetRandomSerialNumber(); ndk::ScopedAStatus res = radio_network->setLinkCapacityReportingCriteria( - serial, 0, 0, 0, {}, {}, AccessNetwork::GERAN); + serial, 0, 0, 0, {}, {}, AccessNetwork::EUTRAN); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); @@ -739,10 +745,7 @@ TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_emptyParams) { ALOGI("setLinkCapacityReportingCriteria_emptyParams, rspInfo.error = %s\n", toString(radioRsp_network->rspInfo.error).c_str()); - // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported - // for GERAN - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::NONE})); } /* @@ -783,19 +786,9 @@ TEST_P(RadioNetworkTest, setSystemSelectionChannels) { } std::vector originalSpecifiers = radioRsp_network->specifiers; - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - serial = GetRandomSerialNumber(); - res = radio_network->setSystemSelectionChannels(serial, true, {specifierP900, specifier850}); + res = radio_network->setSystemSelectionChannels(serial, true, + {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); @@ -808,8 +801,8 @@ TEST_P(RadioNetworkTest, setSystemSelectionChannels) { if (radioRsp_network->rspInfo.error == RadioError::NONE) { serial = GetRandomSerialNumber(); - res = radio_network->setSystemSelectionChannels(serial, false, - {specifierP900, specifier850}); + res = radio_network->setSystemSelectionChannels( + serial, false, {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); @@ -832,20 +825,9 @@ TEST_P(RadioNetworkTest, setSystemSelectionChannels) { TEST_P(RadioNetworkTest, startNetworkScan) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands band17 = - RadioAccessSpecifierBands::make( - {EutranBands::BAND_17}); - RadioAccessSpecifierBands band20 = - RadioAccessSpecifierBands::make( - {EutranBands::BAND_20}); - RadioAccessSpecifier specifier17 = { - .accessNetwork = AccessNetwork::EUTRAN, .bands = band17, .channels = {1, 2}}; - RadioAccessSpecifier specifier20 = { - .accessNetwork = AccessNetwork::EUTRAN, .bands = band20, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifier17, specifier20}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 60, .incrementalResults = false, .incrementalResultsPeriodicity = 1}; @@ -867,10 +849,9 @@ TEST_P(RadioNetworkTest, startNetworkScan) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED})); } else { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, RadioError::NONE, - RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, + RadioError::INVALID_ARGUMENTS})); } } @@ -900,9 +881,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidArgument) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -912,20 +892,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidArgument) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_PERIODIC, .interval = 4, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 60, .incrementalResults = false, .incrementalResultsPeriodicity = 1}; @@ -941,9 +910,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval1) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -953,20 +921,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval1) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_PERIODIC, .interval = 301, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 60, .incrementalResults = false, .incrementalResultsPeriodicity = 1}; @@ -982,9 +939,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval2) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -994,20 +950,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval2) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 59, .incrementalResults = false, .incrementalResultsPeriodicity = 1}; @@ -1023,9 +968,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime1) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -1035,20 +979,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime1) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 3601, .incrementalResults = false, .incrementalResultsPeriodicity = 1}; @@ -1064,9 +997,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime2) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -1076,20 +1008,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime2) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 600, .incrementalResults = true, .incrementalResultsPeriodicity = 0}; @@ -1105,9 +1026,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity1) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -1117,20 +1037,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity1) { TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 600, .incrementalResults = true, .incrementalResultsPeriodicity = 11}; @@ -1146,9 +1055,8 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity2) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_network->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -1158,20 +1066,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity2) { TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest1) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 360, .incrementalResults = false, .incrementalResultsPeriodicity = 10}; @@ -1188,8 +1085,7 @@ TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest1) { {RadioError::NONE, RadioError::SIM_ABSENT})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED})); + {RadioError::NONE, RadioError::INVALID_ARGUMENTS})); } if (radioRsp_network->rspInfo.error == RadioError::NONE) { @@ -1204,20 +1100,9 @@ TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest1) { TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest2) { serial = GetRandomSerialNumber(); - RadioAccessSpecifierBands bandP900 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_P900}); - RadioAccessSpecifierBands band850 = - RadioAccessSpecifierBands::make( - {GeranBands::BAND_850}); - RadioAccessSpecifier specifierP900 = { - .accessNetwork = AccessNetwork::GERAN, .bands = bandP900, .channels = {1, 2}}; - RadioAccessSpecifier specifier850 = { - .accessNetwork = AccessNetwork::GERAN, .bands = band850, .channels = {128, 129}}; - NetworkScanRequest request = {.type = NetworkScanRequest::SCAN_TYPE_ONE_SHOT, .interval = 60, - .specifiers = {specifierP900, specifier850}, + .specifiers = {::EUTRAN_SPECIFIER_17, ::EUTRAN_SPECIFIER_20}, .maxSearchTime = 360, .incrementalResults = false, .incrementalResultsPeriodicity = 10, @@ -1235,8 +1120,7 @@ TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest2) { {RadioError::NONE, RadioError::SIM_ABSENT})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED})); + {RadioError::NONE, RadioError::INVALID_ARGUMENTS})); } if (radioRsp_network->rspInfo.error == RadioError::NONE) { @@ -1253,21 +1137,23 @@ TEST_P(RadioNetworkTest, setNetworkSelectionModeManual) { // can't camp on nonexistent MCCMNC, so we expect this to fail. ndk::ScopedAStatus res = - radio_network->setNetworkSelectionModeManual(serial, "123456", AccessNetwork::GERAN); + radio_network->setNetworkSelectionModeManual(serial, "123456", AccessNetwork::EUTRAN); EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); if (cardStatus.cardState == CardStatus::STATE_ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, - RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, - CHECK_GENERAL_ERROR)); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_STATE, RadioError::RADIO_NOT_AVAILABLE, RadioError::NO_MEMORY, + RadioError::INTERNAL_ERR, RadioError::SYSTEM_ERR, RadioError::CANCELLED})); } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, - RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE}, - CHECK_GENERAL_ERROR)); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS, + RadioError::INVALID_STATE, RadioError::NO_MEMORY, RadioError::INTERNAL_ERR, + RadioError::SYSTEM_ERR, RadioError::CANCELLED})); } }