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

Commit b9ddf021 authored by Roshan Pius's avatar Roshan Pius
Browse files

supplicant(vts): Stop adding empty instance for vendor HAL 

We don't need to test supplicant in the presence of vendor HAL & without
it. For a given device, this behavior is fixed.

Bug: 161951052
Test: atest VtsHalWifiSupplicantV1_1TargetTest
Merged-In: I71097c3afef1765ca514abf2c350c423e3999020
Change-Id: I71097c3afef1765ca514abf2c350c423e3999020
(cherry picked from commit 984b6e06)
parent a9f24023

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 SupplicantHidlTestBase {
@@ -139,21 +140,12 @@ 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;

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest);

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))),