commit 34ebb6dd42dbce4e5c0d04fda91f2a9076fd56b4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 01 17:09:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 01 17:09:55 2020 +0000
tree 948e0c5c7e620bd802eaffcad1785eea761ade6f
parent 20064121a5969fb69059cd1a4a56bb26b0c947ef
parent 8f315a1f279af18ad59574a2dabddb93c49e27ed

Merge "Fix GTestResultParser compatibility" am: 44c14f778b am: 6badfaa8b5 am: 8f315a1f27

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763

Change-Id: I540b986231c4403f77f631835467d8d54e7c4d58

broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp

diff --git a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
index d170a6d..694d52a 100644
--- a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
+++ b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
@@ -116,7 +116,10 @@
 };
 
 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 @@
     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