tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wifi: Fix vts tests error handling

Browse source 
In current code, VTS tests checks on null pointer using EXPECT_NE
then proceed with using the variable. This causes a null pointer
exception when the test fails.
This commit replaces the EXPECT_NE with ASSERT_NE to exit the test
on failure.

Bug: 152576797
Test: atest VtsHalWifiV1_0TargetTest
Change-Id: I5e54634020216f91144a234caf2b990de5706d8c
This commit is contained in:
Ahmed ElArabawy 2020-03-26 21:27:59 -07:00
parent a3e5a6fc9c
commit 7f817f5e23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp
View file

@ -377,7 +377,7 @@ TEST_P(WifiChipHidlTest, GetP2pIfaceNames) {
sp<IWifiP2pIface> iface; sp<IWifiP2pIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&iface)); EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&iface));
EXPECT_NE(nullptr, iface.get()); ASSERT_NE(nullptr, iface.get());
std::string iface_name = getIfaceName(iface); std::string iface_name = getIfaceName(iface);
const auto& status_and_iface_names2 = const auto& status_and_iface_names2 =
@ -404,7 +404,7 @@ TEST_P(WifiChipHidlTest, GetP2pIface) {
sp<IWifiP2pIface> p2p_iface; sp<IWifiP2pIface> p2p_iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&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 iface_name = getIfaceName(p2p_iface);
const auto& status_and_iface1 = const auto& status_and_iface1 =
@ -430,7 +430,7 @@ TEST_P(WifiChipHidlTest, RemoveP2pIface) {
sp<IWifiP2pIface> p2p_iface; sp<IWifiP2pIface> p2p_iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createP2pIface(&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 iface_name = getIfaceName(p2p_iface);
std::string invalid_name = iface_name + "0"; std::string invalid_name = iface_name + "0";
@ -470,7 +470,7 @@ TEST_P(WifiChipHidlTest, GetStaIfaceNames) {
sp<IWifiStaIface> iface; sp<IWifiStaIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface)); EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface));
EXPECT_NE(nullptr, iface.get()); ASSERT_NE(nullptr, iface.get());
std::string iface_name = getIfaceName(iface); std::string iface_name = getIfaceName(iface);
const auto& status_and_iface_names2 = const auto& status_and_iface_names2 =
@ -497,7 +497,7 @@ TEST_P(WifiChipHidlTest, GetStaIface) {
sp<IWifiStaIface> sta_iface; sp<IWifiStaIface> sta_iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&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 iface_name = getIfaceName(sta_iface);
const auto& status_and_iface1 = const auto& status_and_iface1 =
@ -523,7 +523,7 @@ TEST_P(WifiChipHidlTest, RemoveStaIface) {
sp<IWifiStaIface> sta_iface; sp<IWifiStaIface> sta_iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&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 iface_name = getIfaceName(sta_iface);
std::string invalid_name = iface_name + "0"; std::string invalid_name = iface_name + "0";
@ -542,7 +542,7 @@ TEST_P(WifiChipHidlTest, CreateRttController) {
sp<IWifiStaIface> iface; sp<IWifiStaIface> iface;
EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface)); EXPECT_EQ(WifiStatusCode::SUCCESS, createStaIface(&iface));
EXPECT_NE(nullptr, iface.get()); ASSERT_NE(nullptr, iface.get());
const auto& status_and_rtt_controller = const auto& status_and_rtt_controller =
HIDL_INVOKE(wifi_chip_, createRttController, iface); HIDL_INVOKE(wifi_chip_, createRttController, iface);

4
wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp
View file

@ -59,10 +59,10 @@ TEST_P(WifiRttControllerHidlTest, Create) {
const std::string& instance_name = GetInstanceName(); const std::string& instance_name = GetInstanceName();
sp<IWifiChip> wifi_chip = getWifiChip(instance_name); 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); 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 = const auto& status_and_controller =
HIDL_INVOKE(wifi_chip, createRttController, wifi_sta_iface); HIDL_INVOKE(wifi_chip, createRttController, wifi_sta_iface);