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

Commit 7f40eee6 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy
Browse files

Wifi: Fix VTS tests broken due to uprev to Vendor HAL 1.6 

This commit skips the tests for the deprecated HAL APIs due to the
addition of the Vendor HAL ver. 1.6

Bug: 220201314
Test: atest VtsHalWifiRttV1_4TargetTest
Test: atest VtsHalWifiV1_5TargetTest
Change-Id: I9c15249effa9a678115bf644012c0047ad13c66b
parent 6d661670

wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp

+9 −2
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { 
        stopWifi(GetInstanceName());



        wifi_rtt_controller_ = getWifiRttController();

        ASSERT_NE(nullptr, wifi_rtt_controller_.get());

        if (wifi_rtt_controller_.get() == nullptr) {

            GTEST_SKIP() << "Skipping this test since API is deprecated.";

        }



        // Check RTT support before we run the test.

        std::pair<WifiStatus, RttCapabilities> status_and_caps;
@@ -79,7 +81,7 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { 


    virtual void TearDown() override { stopWifi(GetInstanceName()); }



    // A simple test implementation of WifiChipEventCallback.

    // A simple test implementation of WifiRttControllerEventCallback.

    class WifiRttControllerEventCallback

        : public ::testing::VtsHalHidlTargetCallbackBase<

              WifiRttControllerHidlTest>,
@@ -122,6 +124,11 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { 


        const auto& status_and_controller =

            HIDL_INVOKE(wifi_chip, createRttController_1_4, wifi_sta_iface);



        if (status_and_controller.first.code == WifiStatusCode::ERROR_NOT_SUPPORTED) {

            return nullptr;

        }



        EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_controller.first.code);

        EXPECT_NE(nullptr, status_and_controller.second.get());

wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ TEST_P(WifiStaIfaceHidlTest, GetLinkLayerStats_1_5) { 
    // Retrieve link layer stats.

    const auto& status_and_stats =

        HIDL_INVOKE(wifi_sta_iface_, getLinkLayerStats_1_5);



    if (status_and_stats.first.code == WifiStatusCode::ERROR_NOT_SUPPORTED) {

        GTEST_SKIP() << "Skipping this test since API is deprecated.";

    }



    EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_stats.first.code);

    EXPECT_GT(status_and_stats.second.timeStampInMs, 0u);

    // Try to create 2nd iface. If yes, it should fill in the duty cycle field.