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

Commit 7bb5a2ff authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Automerger Merge Worker
Browse files

Merge "Wifi: Fix vts tests error handling" into rvc-dev am: 2ce146de 

Change-Id: I5e2e4776aaa9fa14e8047ac144673e750ffdd84a
parents 1360a555 2ce146de

wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp

+7 −7
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ TEST_P(WifiChipHidlTest, GetP2pIfaceNames) { 


    sp<IWifiP2pIface> iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&iface));

    EXPECT_NE(nullptr, iface.get());

    ASSERT_NE(nullptr, iface.get());



    std::string iface_name = getIfaceName(iface);

    const auto& status_and_iface_names2 =
@@ -404,7 +404,7 @@ TEST_P(WifiChipHidlTest, GetP2pIface) { 


    sp<IWifiP2pIface> p2p_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&p2p_iface));

    EXPECT_NE(nullptr, p2p_iface.get());

    ASSERT_NE(nullptr, p2p_iface.get());



    std::string iface_name = getIfaceName(p2p_iface);

    const auto& status_and_iface1 =
@@ -430,7 +430,7 @@ TEST_P(WifiChipHidlTest, RemoveP2pIface) { 


    sp<IWifiP2pIface> p2p_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&p2p_iface));

    EXPECT_NE(nullptr, p2p_iface.get());

    ASSERT_NE(nullptr, p2p_iface.get());



    std::string iface_name = getIfaceName(p2p_iface);

    std::string invalid_name = iface_name + "0";
@@ -470,7 +470,7 @@ TEST_P(WifiChipHidlTest, GetStaIfaceNames) { 


    sp<IWifiStaIface> iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface));

    EXPECT_NE(nullptr, iface.get());

    ASSERT_NE(nullptr, iface.get());



    std::string iface_name = getIfaceName(iface);

    const auto& status_and_iface_names2 =
@@ -497,7 +497,7 @@ TEST_P(WifiChipHidlTest, GetStaIface) { 


    sp<IWifiStaIface> sta_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&sta_iface));

    EXPECT_NE(nullptr, sta_iface.get());

    ASSERT_NE(nullptr, sta_iface.get());



    std::string iface_name = getIfaceName(sta_iface);

    const auto& status_and_iface1 =
@@ -523,7 +523,7 @@ TEST_P(WifiChipHidlTest, RemoveStaIface) { 


    sp<IWifiStaIface> sta_iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&sta_iface));

    EXPECT_NE(nullptr, sta_iface.get());

    ASSERT_NE(nullptr, sta_iface.get());



    std::string iface_name = getIfaceName(sta_iface);

    std::string invalid_name = iface_name + "0";
@@ -542,7 +542,7 @@ TEST_P(WifiChipHidlTest, CreateRttController) { 


    sp<IWifiStaIface> iface;

    EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface));

    EXPECT_NE(nullptr, iface.get());

    ASSERT_NE(nullptr, iface.get());



    const auto& status_and_rtt_controller =

        HIDL_INVOKE(wifi_chip_, createRttController, iface);

wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ TEST_P(WifiRttControllerHidlTest, Create) { 
    const std::string& instance_name = GetInstanceName();



    sp<IWifiChip> wifi_chip = getWifiChip(instance_name);

    EXPECT_NE(nullptr, wifi_chip.get());

    ASSERT_NE(nullptr, wifi_chip.get());



    sp<IWifiStaIface> wifi_sta_iface = getWifiStaIface(instance_name);

    EXPECT_NE(nullptr, wifi_sta_iface.get());

    ASSERT_NE(nullptr, wifi_sta_iface.get());



    const auto& status_and_controller =

        HIDL_INVOKE(wifi_chip, createRttController, wifi_sta_iface);