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

Commit 436ab20e authored by Ahmed ElArabawy's avatar Ahmed ElArabawy
Browse files

Wifi: Fix VTS tests in VtsHalWifiNanV1_2TargetTest 

This commit fixes VTS tests in VtsHalWifiNanV1_2TargetTest resulting
from upgrading APIs and stopping support for old APIs.

Bug: 146989939
Test: atest VtsHalWifiNanV1_2TargetTest
Change-Id: Ibc71cdb3ead7fb346ac62ebfd132f82ee3d81eeb
parent 36defb37

wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp

+38 −27
Original line number Diff line number Diff line
@@ -481,16 +481,19 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_2InvalidArgs) { 
    callbackType = INVALID;

    NanEnableRequest nanEnableRequest = {};

    NanConfigRequestSupplemental nanConfigRequestSupp = {};

    ASSERT_EQ(WifiStatusCode::SUCCESS,

    const auto& halStatus =

        HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,

                          nanEnableRequest, nanConfigRequestSupp)

                  .code);

                    nanEnableRequest, nanConfigRequestSupp);

    if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {

        ASSERT_EQ(WifiStatusCode::SUCCESS, halStatus.code);



        // wait for a callback

        ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_ENABLE_RESPONSE));

        ASSERT_EQ(NOTIFY_ENABLE_RESPONSE, callbackType);

        ASSERT_EQ(id, inputCmdId);

        ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);

    }

}



/*

 * enableRequest_1_2ShimInvalidArgs: validate that fails with invalid arguments
@@ -502,10 +505,12 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_2ShimInvalidArgs) { 
    nanEnableRequest.configParams.numberOfPublishServiceIdsInBeacon =

        128;  // must be <= 127

    NanConfigRequestSupplemental nanConfigRequestSupp = {};

    ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,

    const auto& halStatus =

        HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,

                          nanEnableRequest, nanConfigRequestSupp)

                  .code);

                    nanEnableRequest, nanConfigRequestSupp);

    if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {

        ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS, halStatus.code);

    }

}



/*
@@ -516,16 +521,20 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_2InvalidArgs) { 
    callbackType = INVALID;

    NanConfigRequest nanConfigRequest = {};

    NanConfigRequestSupplemental nanConfigRequestSupp = {};

    ASSERT_EQ(WifiStatusCode::SUCCESS,

    const auto& halStatus =

        HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,

                          nanConfigRequest, nanConfigRequestSupp)

                  .code);

                    nanConfigRequest, nanConfigRequestSupp);



    if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {

        ASSERT_EQ(WifiStatusCode::SUCCESS, halStatus.code);



        // wait for a callback

        ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_CONFIG_RESPONSE));

        ASSERT_EQ(NOTIFY_CONFIG_RESPONSE, callbackType);

        ASSERT_EQ(id, inputCmdId);

        ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);

    }

}



/*

 * configRequest_1_2ShimInvalidArgs: validate that fails with invalid arguments
@@ -536,10 +545,12 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_2ShimInvalidArgs) { 
    NanConfigRequest nanConfigRequest = {};

    nanConfigRequest.numberOfPublishServiceIdsInBeacon = 128;  // must be <= 127

    NanConfigRequestSupplemental nanConfigRequestSupp = {};

    ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,

    const auto& halStatus =

        HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,

                          nanConfigRequest, nanConfigRequestSupp)

                  .code);

                    nanConfigRequest, nanConfigRequestSupp);

    if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {

        ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS, halStatus.code);

    }

}



INSTANTIATE_TEST_SUITE_P(