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

Commit 52861d4c authored by Jimmy Chen's avatar Jimmy Chen Committed by Android (Google) Code Review
Browse files

Merge "wifi: fix old vts failure due to deprecated API"

parents aad9fe4a 72e0239e

wifi/supplicant/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ cc_test { 
        "android.hardware.wifi.supplicant@1.1",

        "android.hardware.wifi.supplicant@1.2",

        "android.hardware.wifi.supplicant@1.3",

        "android.hardware.wifi.supplicant@1.4",

        "android.hardware.wifi@1.0",

        "libgmock",

        "libwifi-system",

wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp

+11 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <android/hardware/wifi/1.0/IWifi.h>

#include <android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.h>

#include <android/hardware/wifi/supplicant/1.3/ISupplicantStaNetwork.h>

#include <android/hardware/wifi/supplicant/1.4/ISupplicantStaNetwork.h>

#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>
@@ -90,6 +91,8 @@ class SupplicantStaNetworkHidlTest : public SupplicantHidlTestBaseV1_0 { 
         */

        v1_3 = ::android::hardware::wifi::supplicant::V1_3::

            ISupplicantStaNetwork::castFrom(sta_network_);

        v1_4 = ::android::hardware::wifi::supplicant::V1_4::

            ISupplicantStaNetwork::castFrom(sta_network_);



        ssid_.assign(kTestSsidStr, kTestSsidStr + strlen(kTestSsidStr));

    }
@@ -111,6 +114,8 @@ class SupplicantStaNetworkHidlTest : public SupplicantHidlTestBaseV1_0 { 


    sp<::android::hardware::wifi::supplicant::V1_3::ISupplicantStaNetwork>

        v1_3 = nullptr;

    sp<::android::hardware::wifi::supplicant::V1_4::ISupplicantStaNetwork>

        v1_4 = nullptr;

    // ISupplicantStaNetwork object used for all tests in this fixture.

    sp<ISupplicantStaNetwork> sta_network_;

    // SSID to use for various tests.
@@ -151,8 +156,12 @@ TEST_P(SupplicantStaNetworkHidlTest, Create) { 
 */

TEST_P(SupplicantStaNetworkHidlTest, RegisterCallback) {

    sta_network_->registerCallback(

        new NetworkCallback(), [](const SupplicantStatus& status) {

        new NetworkCallback(), [&](const SupplicantStatus& status) {

            if (nullptr != v1_4) {

                EXPECT_EQ(SupplicantStatusCode::FAILURE_UNKNOWN, status.code);

            } else {

                EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);

            }

        });

}