From 4aefd1c1ff3f92fd02fdfb76d7feda93cdea2909 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 2 May 2017 18:58:58 -0700 Subject: [PATCH] Audio HAL VTS: Getter test assert logic was incorrect Test: vts-tradefed run vts --module VtsHalAudioV2_0Target Test: call/play music/record/video... Bug: 36311550 Change-Id: Iaf2d71829a15b12dcf56e825773c8a697896a264 Signed-off-by: Kevin Rocard --- audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp index 0bb0769dd0..6315af81de 100644 --- a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp +++ b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp @@ -594,7 +594,7 @@ class OpenStreamTest : public AudioConfigPrimaryTest, returnIn(res, stream, suggestedConfigRetry))); // This time it must succeed ASSERT_OK(res); - ASSERT_TRUE(stream == nullptr); + ASSERT_TRUE(stream != nullptr); audioConfig = suggestedConfig; break; default: @@ -895,7 +895,9 @@ static void checkGetNoParameter(IStream* stream, hidl_vec keys, ASSERT_OK(stream->getParameters(keys, returnIn(res, parameters))); ASSERT_RESULT(expectedResults, res); if (res == Result::OK) { - ASSERT_EQ(0U, parameters.size()); + for (auto& parameter : parameters) { + ASSERT_EQ(0U, parameter.value.size()) << toString(parameter); + } } }