From 809249059c7a21ca1d4b3bb2331746be541aa0c8 Mon Sep 17 00:00:00 2001 From: Patrik Fimml Date: Tue, 1 Oct 2019 14:14:23 +0200 Subject: [PATCH] Wifi 1.3: Fix STA getFactoryMacAddress test. It's valid for individual bytes in a MAC address to be zero as long as they're not all zero. Bug: 132705022 Bug: 141916952 Test: m -j32 vts && vts-tradefed run vts-hal --skip-preconditions --module VtsHalWifiV1_3Target Change-Id: Ic33a3b80cce90eb4b031aca33aa66bf2a375dc16 --- wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp index 71e90acb93..d382f30e0f 100644 --- a/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.3/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -27,6 +27,8 @@ #include "wifi_hidl_test_utils.h" using ::android::sp; +using ::android::hardware::hidl_array; +using ::android::hardware::wifi::V1_0::WifiStatus; using ::android::hardware::wifi::V1_0::WifiStatusCode; using ::android::hardware::wifi::V1_3::IWifiStaIface; @@ -59,14 +61,11 @@ class WifiStaIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase { * and return a success status code. */ TEST_F(WifiStaIfaceHidlTest, GetFactoryMacAddress) { - const auto& status_and_mac = + std::pair > status_and_mac = HIDL_INVOKE(wifi_sta_iface_, getFactoryMacAddress); EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_mac.first.code); - const int num_elements = sizeof(status_and_mac.second) / sizeof(uint8_t); - EXPECT_EQ(6, num_elements); - for (int i = 0; i < num_elements; i++) { - EXPECT_NE(0, status_and_mac.second[i]); - } + hidl_array all_zero{}; + EXPECT_NE(all_zero, status_and_mac.second); } /*