commit 9ea031229b7874584ac7fb00a5fc58ad5b073648
author Brian Johnson <hibrian@google.com> Fri Jun 30 14:46:34 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Jul 13 00:37:07 2023 +0000
tree 2199c5fbd0d0ca8cdbec9e0d90c7b087f67806a3
parent c655e036a443b9430c5dfeb5985adebda62f41e6

SF: Update unit test to pass non-default mocks.

Update tests to pass non-default mocks so that surfaceflinger internals can be more accurately tested, allowing for testing for division by vsync

Test: on main: lunch cf_x86_64_phone-userdebug && atest
DisplayModeSwitchingTest#changeRefreshRate_OnActiveDisplay_WithoutRefreshRequired
Bug: 278035063
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f626c2f99cdc39266921642eb10d823472c2d74f)
Merged-In: Ica4009c30940dad7a8b1dced712223e8eaabc99a
Change-Id: Ica4009c30940dad7a8b1dced712223e8eaabc99a

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index 5be4548..909b8b8 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -55,6 +55,12 @@
 #include "mock/MockSchedulerCallback.h"
 #include "mock/system/window/MockNativeWindow.h"
 
+#include "Scheduler/VSyncTracker.h"
+#include "Scheduler/VsyncController.h"
+#include "mock/MockVSyncDispatch.h"
+#include "mock/MockVSyncTracker.h"
+#include "mock/MockVsyncController.h"
+
 namespace android {
 
 struct DisplayStatInfo;
@@ -911,6 +917,13 @@
         }
 
         sp<DisplayDevice> inject() NO_THREAD_SAFETY_ANALYSIS {
+            return inject(std::make_unique<mock::VsyncController>(),
+                          std::make_shared<mock::VSyncTracker>());
+        }
+
+        sp<DisplayDevice> inject(std::unique_ptr<android::scheduler::VsyncController> controller,
+                                 std::shared_ptr<android::scheduler::VSyncTracker> tracker)
+                NO_THREAD_SAFETY_ANALYSIS {
             const auto displayId = mCreationArgs.compositionDisplay->getDisplayId();
 
             auto& modes = mDisplayModes;
@@ -975,7 +988,9 @@
 
                 if (mFlinger.scheduler() && mRegisterDisplay) {
                     mFlinger.scheduler()->registerDisplay(physicalId,
-                                                          display->holdRefreshRateSelector());
+                                                          display->holdRefreshRateSelector(),
+                                                          std::move(controller),
+                                                          std::move(tracker));
                 }
 
                 display->setActiveMode(activeModeId, fps, fps);