Fix GTestResultParser compatibility

Bug: 158643176
Test: adb shell /data/nativetest64/VtsHalBroadcastradioV2_0TargetTest/VtsHalBroadcastradioV2_0TargetTest
Change-Id: Id0c936da397f7b06b2f274e036dc789cdcd506da
This commit is contained in:
Tomasz Wasilczyk
2020-06-29 10:22:43 -07:00
parent 31c434b96c
commit cd4a393014

View File

@@ -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