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

Commit 566f1dcd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: fix unittest failure for minFramePeriod" into main

parents b8c3c872 c94bffc7

services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayModeSwitching.cpp

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ public: 
        EXPECT_CALL(*vsyncTracker, currentPeriod())

                .WillRepeatedly(Return(

                        TestableSurfaceFlinger::FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD));

        EXPECT_CALL(*vsyncTracker, minFramePeriod())

                .WillRepeatedly(Return(Period::fromNs(

                        TestableSurfaceFlinger::FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD)));



        mDisplay = PrimaryDisplayVariant::makeFakeExistingDisplayInjector(this)

                           .setRefreshRateSelector(std::move(selectorPtr))
@@ -138,6 +141,9 @@ void DisplayModeSwitchingTest::setupScheduler( 
    EXPECT_CALL(*vsyncTracker, currentPeriod())

            .WillRepeatedly(

                    Return(TestableSurfaceFlinger::FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD));

    EXPECT_CALL(*vsyncTracker, minFramePeriod())

            .WillRepeatedly(Return(Period::fromNs(

                    TestableSurfaceFlinger::FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD)));

    EXPECT_CALL(*vsyncTracker, nextAnticipatedVSyncTimeFrom(_)).WillRepeatedly(Return(0));

    mFlinger.setupScheduler(std::move(vsyncController), std::move(vsyncTracker),

                            std::move(eventThread), std::move(sfEventThread),

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ public: 
        EXPECT_CALL(*vsyncTracker, nextAnticipatedVSyncTimeFrom(_)).WillRepeatedly(Return(0));

        EXPECT_CALL(*vsyncTracker, currentPeriod())

                .WillRepeatedly(Return(FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD));

        EXPECT_CALL(*vsyncTracker, minFramePeriod())

                .WillRepeatedly(

                        Return(Period::fromNs(FakeHwcDisplayInjector::DEFAULT_VSYNC_PERIOD)));

        EXPECT_CALL(*vsyncTracker, nextAnticipatedVSyncTimeFrom(_)).WillRepeatedly(Return(0));

        setupScheduler(std::move(vsyncController), std::move(vsyncTracker), std::move(eventThread),

                       std::move(sfEventThread), DefaultDisplayMode{options.displayId},

services/surfaceflinger/tests/unittests/mock/MockVSyncTracker.cpp

+5 −1
Original line number Diff line number Diff line
@@ -17,9 +17,13 @@ 
#include "mock/MockVSyncTracker.h"



namespace android::mock {

using testing::Return;



// Explicit default instantiation is recommended.

VSyncTracker::VSyncTracker() = default;

VSyncTracker::~VSyncTracker() = default;



VSyncTracker::VSyncTracker() {

    ON_CALL(*this, minFramePeriod()).WillByDefault(Return(Period::fromNs(0)));

}



} // namespace android::mock