diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-01 16:59:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 16:59:02 +0000 |
| commit | 8f315a1f279af18ad59574a2dabddb93c49e27ed (patch) | |
| tree | 4974daf369247c8bb88a04d339821a454d0c5a53 /broadcastradio | |
| parent | 478757a9553e519792f88d8baa0f4bf034417e20 (diff) | |
| parent | 6badfaa8b599600a97c26717f8e9cda6036db32f (diff) | |
| download | platform_hardware_interfaces-8f315a1f279af18ad59574a2dabddb93c49e27ed.tar.gz platform_hardware_interfaces-8f315a1f279af18ad59574a2dabddb93c49e27ed.tar.bz2 platform_hardware_interfaces-8f315a1f279af18ad59574a2dabddb93c49e27ed.zip | |
Merge "Fix GTestResultParser compatibility" am: 44c14f778b am: 6badfaa8b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352763
Change-Id: I13156db2e3016d816fbd19ac4ec7bbee87c2855f
Diffstat (limited to 'broadcastradio')
| -rw-r--r-- | broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp | 10 |
1 files 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<std::string> { }; 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 |