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

Commit 2df1b39e authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: fix unit tests when reset_model_flushes_fence is enabled 

Bug: 272802278
Test: presubmit
Flag: com.android.graphics.surfaceflinger.flags.reset_model_flushes_fence
Change-Id: Id735657189460f9f405fb53702801bb1283b0868
parent 4906b3fa

services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPhysicalDisplayPowerModeTest.cpp

+8 −2
Original line number Diff line number Diff line
@@ -75,9 +75,15 @@ struct DispSyncIsSupportedVariant { 
                    onDisplayModeChanged(DisplayModeFps(Fps::fromPeriodNsecs(DEFAULT_VSYNC_PERIOD)),

                                         false))

                .Times(1);

        if (FlagManager::getInstance().reset_model_flushes_fence()) {

            EXPECT_CALL(static_cast<mock::VsyncController&>(vsyncSchedule->getController()),

                        resetModel())

                    .Times(1);

        } else {

            EXPECT_CALL(static_cast<mock::VSyncTracker&>(vsyncSchedule->getTracker()), resetModel())

                    .Times(1);

        }

    }

};



struct DispSyncNotSupportedVariant {

services/surfaceflinger/tests/unittests/VSyncReactorTest.cpp

+5 −4
Original line number Diff line number Diff line
@@ -158,15 +158,16 @@ TEST_F(VSyncReactorTest, addingPendingFenceAddsSignalled) { 
}



TEST_F(VSyncReactorTest, limitsPendingFences) {

    std::array<std::shared_ptr<android::FenceTime>, kPendingLimit * 2> fences;

    FenceToFenceTimeMap fenceMap;

    std::array<FenceToFenceTimeMap::FencePair, kPendingLimit * 2> fences;

    std::array<nsecs_t, fences.size()> fakeTimes;

    std::generate(fences.begin(), fences.end(), [] { return generatePendingFence(); });

    std::generate(fences.begin(), fences.end(), [&] { return fenceMap.makePendingFenceForTest(); });

    std::generate(fakeTimes.begin(), fakeTimes.end(), [i = 10]() mutable {

        i++;

        return i * i;

    });



    for (auto const& fence : fences) {

    for (auto const& [_, fence] : fences) {

        mReactor.addPresentFence(fence);

    }
@@ -175,7 +176,7 @@ TEST_F(VSyncReactorTest, limitsPendingFences) { 
    }



    for (auto i = 0u; i < fences.size(); i++) {

        signalFenceWithTime(fences[i], fakeTimes[i]);

        fenceMap.signalAllForTest(fences[i].first, fakeTimes[i]);

    }

    mReactor.addPresentFence(generatePendingFence());

}