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

Commit 550bb6b4 authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "Improve initialization sequence for supplicant AIDL VTS tests." am:... 

Merge "Improve initialization sequence for supplicant AIDL VTS tests." am: 1048b42e am: 352fc910 am: 36072bf0 am: fddd9573

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1966398

Change-Id: If38b8bfe7cfe510a07293c1aabe6a785dd8e7380
parents ad59f89a fddd9573

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

+34 −33
Original line number Diff line number Diff line
@@ -69,37 +69,6 @@ bool waitForSupplicantStart() { return waitForSupplicantState(true); } 
// disable.

bool waitForSupplicantStop() { return waitForSupplicantState(false); }



// Helper function to initialize the driver and firmware to STA mode

// using the vendor HAL HIDL interface.

void initilializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);

        ChipModeId mode_id;

        EXPECT_TRUE(configureChipToSupportIfaceType(

            wifi_chip, ::android::hardware::wifi::V1_0::IfaceType::STA, &mode_id));

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}



// Helper function to deinitialize the driver and firmware

// using the vendor HAL HIDL interface.

void deInitilializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        stopWifi(wifi_instance_name);

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}



// Helper function to find any iface of the desired type exposed.

bool findIfaceOfType(sp<ISupplicant> supplicant, IfaceType desired_type,

                     ISupplicant::IfaceInfo* out_info) {
@@ -156,14 +125,46 @@ void stopSupplicant(const std::string& wifi_instance_name) { 
    SupplicantManager supplicant_manager;



    ASSERT_TRUE(supplicant_manager.StopSupplicant());

    deInitilializeDriverAndFirmware(wifi_instance_name);

    deInitializeDriverAndFirmware(wifi_instance_name);

    ASSERT_FALSE(supplicant_manager.IsSupplicantRunning());

}



// Helper function to initialize the driver and firmware to STA mode

// using the vendor HAL HIDL interface.

void initializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);

        ChipModeId mode_id;

        EXPECT_TRUE(configureChipToSupportIfaceType(

            wifi_chip, ::android::hardware::wifi::V1_0::IfaceType::STA,

            &mode_id));

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}



// Helper function to deinitialize the driver and firmware

// using the vendor HAL HIDL interface.

void deInitializeDriverAndFirmware(const std::string& wifi_instance_name) {

    // Skip if wifi instance is not set.

    if (wifi_instance_name == "") {

        return;

    }

    if (getWifi(wifi_instance_name) != nullptr) {

        stopWifi(wifi_instance_name);

    } else {

        LOG(WARNING) << __func__ << ": Vendor HAL not supported";

    }

}



void startSupplicantAndWaitForHidlService(

    const std::string& wifi_instance_name,

    const std::string& supplicant_instance_name) {

    initilializeDriverAndFirmware(wifi_instance_name);

    initializeDriverAndFirmware(wifi_instance_name);



    SupplicantManager supplicant_manager;

    ASSERT_TRUE(supplicant_manager.StartSupplicant());

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ void startSupplicantAndWaitForHidlService( 
    const std::string& wifi_instance_name,

    const std::string& supplicant_instance_name);



// Used to initialize/deinitialize the driver and firmware at the

// beginning and end of each test.

void initializeDriverAndFirmware(const std::string& wifi_instance_name);

void deInitializeDriverAndFirmware(const std::string& wifi_instance_name);



// Helper functions to obtain references to the various HIDL interface objects.

// Note: We only have a single instance of each of these objects currently.

// These helper functions should be modified to return vectors if we support

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

+36 −0
Original line number Diff line number Diff line
@@ -33,11 +33,23 @@ cc_test { 
    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

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

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

        "android.hardware.wifi.supplicant-V1-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

    ],

    test_suites: [

        "general-tests",
@@ -55,11 +67,23 @@ cc_test { 
    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

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

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

        "android.hardware.wifi.supplicant-V1-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

    ],

    test_suites: [

        "general-tests",
@@ -77,11 +101,23 @@ cc_test { 
    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

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

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

        "android.hardware.wifi.supplicant-V1-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

    ],

    test_suites: [

        "general-tests",

wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp

+3 −4
Original line number Diff line number Diff line
@@ -169,8 +169,7 @@ class SupplicantP2pIfaceAidlTest : public testing::TestWithParam<std::string> { 
   public:

    void SetUp() override {

        initializeService();

        supplicant_ = ISupplicant::fromBinder(ndk::SpAIBinder(

            AServiceManager_waitForService(GetParam().c_str())));

        supplicant_ = getSupplicant(GetParam().c_str());

        ASSERT_NE(supplicant_, nullptr);

        ASSERT_TRUE(supplicant_

                        ->setDebugParams(DebugLevel::EXCESSIVE,
@@ -184,13 +183,13 @@ class SupplicantP2pIfaceAidlTest : public testing::TestWithParam<std::string> { 
            GTEST_SKIP() << "Wi-Fi Direct is not supported, skip this test.";

        }



        EXPECT_TRUE(supplicant_->addP2pInterface(getP2pIfaceName(), &p2p_iface_)

        EXPECT_TRUE(supplicant_->getP2pInterface(getP2pIfaceName(), &p2p_iface_)

                        .isOk());

        ASSERT_NE(p2p_iface_, nullptr);

    }



    void TearDown() override {

        stopSupplicant();

        stopSupplicantService();

        startWifiFramework();

    }

wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp

+3 −4
Original line number Diff line number Diff line
@@ -203,21 +203,20 @@ class SupplicantStaIfaceAidlTest : public testing::TestWithParam<std::string> { 
   public:

    void SetUp() override {

        initializeService();

        supplicant_ = ISupplicant::fromBinder(ndk::SpAIBinder(

            AServiceManager_waitForService(GetParam().c_str())));

        supplicant_ = getSupplicant(GetParam().c_str());

        ASSERT_NE(supplicant_, nullptr);

        ASSERT_TRUE(supplicant_

                        ->setDebugParams(DebugLevel::EXCESSIVE,

                                         true,  // show timestamps

                                         true)

                        .isOk());

        EXPECT_TRUE(supplicant_->addStaInterface(getStaIfaceName(), &sta_iface_)

        EXPECT_TRUE(supplicant_->getStaInterface(getStaIfaceName(), &sta_iface_)

                        .isOk());

        ASSERT_NE(sta_iface_, nullptr);

    }



    void TearDown() override {

        stopSupplicant();

        stopSupplicantService();

        startWifiFramework();

    }