commit 19d3a0a2f72cfc26486047578269adf2f24343cf
author Mikhail Naganov <mnaganov@google.com> Mon Feb 08 17:16:37 2021 -0800
committer Mikhail Naganov <mnaganov@google.com> Wed Feb 10 20:52:36 2021 +0000
tree 8118b8265f819913cc3ac2af9cec64d2bff73e3b
parent c425880bfec08ec5a75566d90cff121ce52a9311

Improve failure logging in AudioHealthTest

Print the types of the devices that were not found
in the list of the attached devices.

Bug: 179743630
Test: atest audio_health_tests
Change-Id: I157b6779b8426dd8601c20ee07ecf414850fb09e
Merged-In: I157b6779b8426dd8601c20ee07ecf414850fb09e

services/audiopolicy/tests/audio_health_tests.cpp

diff --git a/services/audiopolicy/tests/audio_health_tests.cpp b/services/audiopolicy/tests/audio_health_tests.cpp
index b5c67a1..e1634cf 100644
--- a/services/audiopolicy/tests/audio_health_tests.cpp
+++ b/services/audiopolicy/tests/audio_health_tests.cpp
@@ -21,6 +21,7 @@
 #include <gtest/gtest.h>
 
 #include <media/AudioSystem.h>
+#include <media/TypeConverter.h>
 #include <system/audio.h>
 #include <utils/Log.h>
 
@@ -68,9 +69,18 @@
     ASSERT_NE("AudioPolicyConfig::setDefault", manager.getConfig().getSource());
 
     for (auto desc : manager.getConfig().getInputDevices()) {
-        ASSERT_NE(attachedDevices.end(), attachedDevices.find(desc->type()));
+        if (attachedDevices.find(desc->type()) == attachedDevices.end()) {
+            std::string deviceType;
+            (void)DeviceConverter::toString(desc->type(), deviceType);
+            ADD_FAILURE() << "Input device \"" << deviceType << "\" not found";
+        }
     }
     for (auto desc : manager.getConfig().getOutputDevices()) {
-        ASSERT_NE(attachedDevices.end(), attachedDevices.find(desc->type()));
+        if (attachedDevices.find(desc->type()) == attachedDevices.end()) {
+            std::string deviceType;
+            (void)DeviceConverter::toString(desc->type(), deviceType);
+            ADD_FAILURE() << "Output device \"" << deviceType << "\" not found";
+        }
     }
 }
+