Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f315a1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix GTestResultParser compatibility" am: 44c14f77 am: 6badfaa8

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

Change-Id: I13156db2e3016d816fbd19ac4ec7bbee87c2855f
parents 478757a9 6badfaa8
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -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,
@@ -429,7 +432,8 @@ TEST_P(BroadcastRadioHalTest, FmTune) {
    EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_,
                        InfoHasId(utils::make_identifier(IdentifierType::AMFM_FREQUENCY, freq)))
            .Times(AnyNumber())
        .WillOnce(DoAll(SaveArg<0>(&infoCb), testing::Return(ByMove(Void()))));
            .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