Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df769213 authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Fix test of triggerEmergencyNetworkScan

triggerEmergencyNetworkScan needs to be triggered after
setEmergencyMode.

Bug: 336706719
Test: atest VtsHalRadioTargetTest:PerInstance/RadioNetworkTest#triggerEmergencyNetworkScan/0_android_hardware_radio_network_IRadioNetwork_slot1 -- --abi arm64-v8a
Change-Id: If32d594525bea3a4a4562e2b1070ef646744513f
parent e8d40f90
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
@@ -2195,6 +2195,18 @@ TEST_P(RadioNetworkTest, triggerEmergencyNetworkScan) {

    serial = GetRandomSerialNumber();

    radio_network->setEmergencyMode(serial, EmergencyMode::EMERGENCY_WWAN);
    EXPECT_EQ(std::cv_status::no_timeout, wait());
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
    EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

    ASSERT_TRUE(CheckAnyOfErrors(
            radioRsp_network->rspInfo.error,
            {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::RADIO_NOT_AVAILABLE,
             RadioError::MODEM_ERR, RadioError::INVALID_ARGUMENTS}));

    serial = GetRandomSerialNumber();

    EmergencyNetworkScanTrigger scanRequest;
    scanRequest.accessNetwork = {AccessNetwork::EUTRAN};
    scanRequest.scanType = EmergencyScanType::NO_PREFERENCE;
@@ -2208,6 +2220,19 @@ TEST_P(RadioNetworkTest, triggerEmergencyNetworkScan) {
            radioRsp_network->rspInfo.error,
            {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::RADIO_NOT_AVAILABLE,
             RadioError::MODEM_ERR, RadioError::INVALID_ARGUMENTS}));

    // exit emergency mode for other tests
    serial = GetRandomSerialNumber();

    radio_network->exitEmergencyMode(serial);

    EXPECT_EQ(std::cv_status::no_timeout, wait());
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
    EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
                                 {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,
                                  RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
}

/*