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

Commit 20aa01c2 authored by Yomna Nasser's avatar Yomna Nasser
Browse files

VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap 

Fix VTS for getAllowedNetworkTypesBitmap and
setAllowedNetworkTypesBitmap, which should not rely on
getRadioHalCapabilities.

Bug: b/199809900
Test: atest VtsHalRadioV1_6TargetTest
Change-Id: I0b50e7e6c0d406a62f7a1e2ea8ac9bc3a71d8aeb
parent 7b41c061

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+22 −34
Original line number Diff line number Diff line
@@ -32,14 +32,8 @@ TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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



    if (getRadioHalCapabilities()) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

    ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,

                             {::android::hardware::radio::V1_6::RadioError::NONE,

                              ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,

                              ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED,
@@ -47,9 +41,9 @@ TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) { 
                              ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                              ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                              ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                              ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                              ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

}

}



/*

 * Test IRadio.getAllowedNetworkTypesBitmap for the response returned.
@@ -74,12 +68,6 @@ TEST_P(RadioHidlTest_v1_6, getAllowedNetworkTypesBitmap) { 
        EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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



        if (getRadioHalCapabilities()) {

            ASSERT_TRUE(CheckAnyOfErrors(

                    radioRsp_v1_6->rspInfo.error,

                    {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

        } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::NONE,
@@ -89,10 +77,10 @@ TEST_P(RadioHidlTest_v1_6, getAllowedNetworkTypesBitmap) { 
                 ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                 ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                 ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                 ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

    }

}

}



/*

 * Test IRadio.setupDataCall_1_6() for the response returned.