Merge "Fix GTestResultParser compatibility"
This commit is contained in:
commit
44c14f778b
1 changed files with 7 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue