commit 809249059c7a21ca1d4b3bb2331746be541aa0c8
author Patrik Fimml <patrikf@google.com> Tue Oct 01 14:14:23 2019 +0200
committer Patrik Fimml <patrikf@google.com> Wed Oct 02 17:02:45 2019 +0200
tree b9b236c99e024ae6b365c45b646f6a4857560e84
parent 147f26b1eacb01b4d5ef3b26cccf42bdd0050afc

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

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 71e90ac..d382f30 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 @@
  * and return a success status code.
  */
 TEST_F(WifiStaIfaceHidlTest, GetFactoryMacAddress) {
-    const auto& status_and_mac =
+    std::pair<WifiStatus, hidl_array<uint8_t, 6> > 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<uint8_t, 6> all_zero{};
+    EXPECT_NE(all_zero, status_and_mac.second);
 }
 
 /*