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

Commit f9a770a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "supplicant(vts): Stop adding empty instance for vendor HAL" into android11-tests-dev

parents c6a10ed8 984b6e06

wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp

+3 −11
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatus; 
using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode;

using ::android::hardware::wifi::supplicant::V1_0::IfaceType;

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

using ::android::hardware::wifi::V1_0::IWifi;

using ::android::sp;



class SupplicantHidlTest : public SupplicantHidlTestBaseV1_1 {
@@ -139,20 +140,11 @@ TEST_P(SupplicantHidlTest, RemoveP2pInterface) { 
 */

TEST_P(SupplicantHidlTest, Terminate) { supplicant_->terminate(); }



static std::vector<std::string> get_wifi_instances() {

    std::vector<std::string> instances =

        android::hardware::getAllHalInstanceNames(

            android::hardware::wifi::V1_0::IWifi::descriptor);

    // Also test when wifi instance is not set.

    instances.push_back("");



    return instances;

}



INSTANTIATE_TEST_CASE_P(

    PerInstance, SupplicantHidlTest,

    testing::Combine(

        testing::ValuesIn(get_wifi_instances()),

        testing::ValuesIn(

            android::hardware::getAllHalInstanceNames(IWifi::descriptor)),

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(

            android::hardware::wifi::supplicant::V1_1::ISupplicant::

                descriptor))),