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

Commit 5cc7f046 authored by Yomna Nasser's avatar Yomna Nasser Committed by Gerrit Code Review
Browse files

Merge "Check API values only if modem supports APIs" into main

parents 0309dddb d4a8add7

radio/aidl/vts/radio_network_test.cpp

+37 −32
Original line number Original line Diff line number Diff line
@@ -2494,6 +2494,7 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { 
                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));





    if (radioRsp_network->rspInfo.error == RadioError::NONE) {

        // Assert the value has changed

        // Assert the value has changed

        serial = GetRandomSerialNumber();

        serial = GetRandomSerialNumber();

        ndk::ScopedAStatus res = radio_network->isCellularIdentifierTransparencyEnabled(serial);

        ndk::ScopedAStatus res = radio_network->isCellularIdentifierTransparencyEnabled(serial);
@@ -2508,11 +2509,13 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { 
        EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled);

        EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled);





        // Reset original state

        // Reset original state

    radio_network->setCellularIdentifierTransparencyEnabled(serial, originalTransparencySetting);

        radio_network->setCellularIdentifierTransparencyEnabled(serial,

                                                                originalTransparencySetting);

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

        EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

        EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

    }

    }

}





/*

/*

 * Test IRadioNetwork.setSecurityAlgorithmsUpdatedEnabled for the response returned.

 * Test IRadioNetwork.setSecurityAlgorithmsUpdatedEnabled for the response returned.
@@ -2547,6 +2550,7 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { 
                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));





    if (radioRsp_network->rspInfo.error == RadioError::NONE) {

        // Assert the value has changed

        // Assert the value has changed

        serial = GetRandomSerialNumber();

        serial = GetRandomSerialNumber();

        ndk::ScopedAStatus res = radio_network->isSecurityAlgorithmsUpdatedEnabled(serial);

        ndk::ScopedAStatus res = radio_network->isSecurityAlgorithmsUpdatedEnabled(serial);
@@ -2566,6 +2570,7 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { 
        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

        EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

        EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

    }

    }

}





/**

/**

 * Test IRadioNetwork.isSecurityAlgorithmsUpdatedEnabled for the response returned.

 * Test IRadioNetwork.isSecurityAlgorithmsUpdatedEnabled for the response returned.