From 751855d89b2a96d9f9290fe9381d573e9d27c8db Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Mon, 29 Jun 2020 10:22:43 -0700 Subject: [PATCH] Fix GTestResultParser compatibility Bug: 158643176 Test: adb shell /data/nativetest64/VtsHalBroadcastradioV2_0TargetTest/VtsHalBroadcastradioV2_0TargetTest Change-Id: Id0c936da397f7b06b2f274e036dc789cdcd506da --- .../functional/VtsHalBroadcastradioV2_0TargetTest.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp index d170a6d469..694d52a094 100644 --- a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp +++ b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp @@ -116,7 +116,10 @@ class BroadcastRadioHalTest : public ::testing::TestWithParam { }; static void printSkipped(std::string msg) { - std::cout << "[ SKIPPED ] " << msg << std::endl; + const auto testInfo = testing::UnitTest::GetInstance()->current_test_info(); + std::cout << "[ SKIPPED ] " << testInfo->test_case_name() << "." << testInfo->name() + << std::endl; + std::cout << msg << std::endl; } MATCHER_P(InfoHasId, id, @@ -428,8 +431,9 @@ TEST_P(BroadcastRadioHalTest, FmTune) { ProgramInfo infoCb = {}; EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_, InfoHasId(utils::make_identifier(IdentifierType::AMFM_FREQUENCY, freq))) - .Times(AnyNumber()) - .WillOnce(DoAll(SaveArg<0>(&infoCb), testing::Return(ByMove(Void())))); + .Times(AnyNumber()) + .WillOnce(DoAll(SaveArg<0>(&infoCb), testing::Return(ByMove(Void())))) + .WillRepeatedly(testing::InvokeWithoutArgs([] { return Void(); })); auto result = mSession->tune(sel); // expect a failure if it's not supported