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

Commit 96a76b8f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DPP] Added VTS tests for supplicant HAL v1.2"

parents 9bed22a4 998d7369

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ 
    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.wifi.supplicant</name>

        <version>1.0-1</version>

        <version>1.0-2</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

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

+28 −0
Original line number Diff line number Diff line
@@ -36,6 +36,32 @@ cc_library_static { 
    ],

}



cc_test {

    name: "VtsHalWifiSupplicantV1_2TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "VtsHalWifiSupplicantV1_2TargetTest.cpp",

        "supplicant_sta_iface_hidl_test.cpp",

        "supplicant_sta_network_hidl_test.cpp",

    ],

    static_libs: [

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

        "VtsHalWifiSupplicantV1_1TargetTestUtil",

        "VtsHalWifiSupplicantV1_2TargetTestUtil",

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

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

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

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "libcrypto",

        "libgmock",

        "libwifi-system",

        "libwifi-system-iface",

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "VtsHalWifiSupplicantP2pV1_2TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],
@@ -52,9 +78,11 @@ cc_test { 
        "android.hardware.wifi.supplicant@1.1",

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

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "libcrypto",

        "libgmock",

        "libwifi-system",

        "libwifi-system-iface",

    ],

}

wifi/supplicant/1.2/vts/functional/VtsHalWifiSupplicantV1_2TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
 */



#include <android-base/logging.h>



#include <android/hardware/wifi/supplicant/1.1/ISupplicant.h>

#include <android/hardware/wifi/1.1/IWifi.h>

#include <android/hardware/wifi/supplicant/1.2/ISupplicant.h>



#include "supplicant_hidl_test_utils.h"
@@ -32,6 +31,7 @@ class WifiSupplicantHidlEnvironment_1_2 : public WifiSupplicantHidlEnvironment { 
    }

    virtual void registerTestServices() override {

        registerTestService<::android::hardware::wifi::V1_0::IWifi>();

        registerTestService<::android::hardware::wifi::V1_1::IWifi>();

        registerTestService<

            ::android::hardware::wifi::supplicant::V1_0::ISupplicant>();

        registerTestService<

wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp

+15 −0
Original line number Diff line number Diff line
@@ -21,7 +21,22 @@ 
#include "supplicant_hidl_test_utils_1_2.h"



using ::android::sp;

using ::android::hardware::wifi::supplicant::V1_2::ISupplicant;

using ::android::hardware::wifi::supplicant::V1_2::ISupplicantP2pIface;

using ::android::hardware::wifi::supplicant::V1_2::ISupplicantStaIface;

using ::android::hardware::wifi::supplicant::V1_2::ISupplicantStaNetwork;



sp<ISupplicant> getSupplicant_1_2() {

    return ISupplicant::castFrom(getSupplicant());

}



sp<ISupplicantStaIface> getSupplicantStaIface_1_2() {

    return ISupplicantStaIface::castFrom(getSupplicantStaIface());

}



sp<ISupplicantStaNetwork> createSupplicantStaNetwork_1_2() {

    return ISupplicantStaNetwork::castFrom(createSupplicantStaNetwork());

}



sp<ISupplicantP2pIface> getSupplicantP2pIface_1_2() {

    return ISupplicantP2pIface::castFrom(getSupplicantP2pIface());

wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.h

+12 −0
Original line number Diff line number Diff line
@@ -17,7 +17,19 @@ 
#ifndef SUPPLICANT_HIDL_TEST_UTILS_1_2_H

#define SUPPLICANT_HIDL_TEST_UTILS_1_2_H



#include <android/hardware/wifi/supplicant/1.2/ISupplicant.h>

#include <android/hardware/wifi/supplicant/1.2/ISupplicantP2pIface.h>

#include <android/hardware/wifi/supplicant/1.2/ISupplicantStaIface.h>

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



android::sp<android::hardware::wifi::supplicant::V1_2::ISupplicant>

getSupplicant_1_2();



android::sp<android::hardware::wifi::supplicant::V1_2::ISupplicantStaIface>

getSupplicantStaIface_1_2();



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

createSupplicantStaNetwork_1_2();



android::sp<android::hardware::wifi::supplicant::V1_2::ISupplicantP2pIface>

getSupplicantP2pIface_1_2();