diff options
| -rw-r--r-- | services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp | 106 |
1 files changed, 55 insertions, 51 deletions
diff --git a/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp b/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp index 4342dc983d..b7e55f4822 100644 --- a/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp +++ b/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp @@ -27,6 +27,7 @@ using namespace std::chrono_literals; using testing::_; +using testing::AtLeast; namespace android { namespace scheduler { @@ -75,7 +76,7 @@ TEST_F(RefreshRateStatsTest, canCreateAndDestroyTest) { init(configs); // There is one default config, so the refresh rates should have one item. - ASSERT_EQ(1, mRefreshRateStats->getTotalTimes().size()); + EXPECT_EQ(1, mRefreshRateStats->getTotalTimes().size()); } TEST_F(RefreshRateStatsTest, oneConfigTest) { @@ -88,13 +89,14 @@ TEST_F(RefreshRateStatsTest, oneConfigTest) { init(configs); - EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(4); - EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(2); + EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(AtLeast(1)); + EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(AtLeast(1)); std::unordered_map<std::string, int64_t> times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(2, times.size()); - ASSERT_EQ(0, times["ScreenOff"]); - ASSERT_EQ(0, times["90fps"]); + EXPECT_EQ(2, times.size()); + EXPECT_NE(0u, times.count("ScreenOff")); + EXPECT_EQ(1u, times.count("90fps")); + EXPECT_EQ(0, times["90fps"]); // Setting up tests on mobile harness can be flaky with time passing, so testing for // exact time changes can result in flaxy numbers. To avoid that remember old // numbers to make sure the correct values are increasing in the next test. @@ -104,31 +106,31 @@ TEST_F(RefreshRateStatsTest, oneConfigTest) { // Screen is off by default. std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(0, times["90fps"]); - screenOff = times["ScreenOff"]; + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(0, times["90fps"]); mRefreshRateStats->setPowerMode(HWC_POWER_MODE_NORMAL); + screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(screenOff, times["ScreenOff"]); - ASSERT_LT(ninety, times["90fps"]); - ninety = times["90fps"]; + EXPECT_EQ(screenOff, times["ScreenOff"]); + EXPECT_LT(ninety, times["90fps"]); mRefreshRateStats->setPowerMode(HWC_POWER_MODE_DOZE); + ninety = mRefreshRateStats->getTotalTimes()["90fps"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); - screenOff = times["ScreenOff"]; + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); mRefreshRateStats->setConfigMode(CONFIG_ID_90); + screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); // Because the power mode is not HWC_POWER_MODE_NORMAL, switching the config // does not update refresh rates that come from the config. - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); } TEST_F(RefreshRateStatsTest, twoConfigsTest) { @@ -145,15 +147,17 @@ TEST_F(RefreshRateStatsTest, twoConfigsTest) { init(configs); - EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(6); - EXPECT_CALL(*mTimeStats, recordRefreshRate(60, _)).Times(4); - EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(4); + EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(AtLeast(1)); + EXPECT_CALL(*mTimeStats, recordRefreshRate(60, _)).Times(AtLeast(1)); + EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(AtLeast(1)); std::unordered_map<std::string, int64_t> times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(3, times.size()); - ASSERT_EQ(0, times["ScreenOff"]); - ASSERT_EQ(0, times["60fps"]); - ASSERT_EQ(0, times["90fps"]); + EXPECT_EQ(3, times.size()); + EXPECT_NE(0u, times.count("ScreenOff")); + EXPECT_EQ(1u, times.count("60fps")); + EXPECT_EQ(0, times["60fps"]); + EXPECT_EQ(1u, times.count("90fps")); + EXPECT_EQ(0, times["90fps"]); // Setting up tests on mobile harness can be flaky with time passing, so testing for // exact time changes can result in flaxy numbers. To avoid that remember old // numbers to make sure the correct values are increasing in the next test. @@ -164,61 +168,61 @@ TEST_F(RefreshRateStatsTest, twoConfigsTest) { // Screen is off by default. std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(sixty, times["60fps"]); - ASSERT_EQ(ninety, times["90fps"]); - screenOff = times["ScreenOff"]; + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(sixty, times["60fps"]); + EXPECT_EQ(ninety, times["90fps"]); mRefreshRateStats->setPowerMode(HWC_POWER_MODE_NORMAL); + screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(screenOff, times["ScreenOff"]); - ASSERT_EQ(sixty, times["60fps"]); - ASSERT_LT(ninety, times["90fps"]); - ninety = times["90fps"]; + EXPECT_EQ(screenOff, times["ScreenOff"]); + EXPECT_EQ(sixty, times["60fps"]); + EXPECT_LT(ninety, times["90fps"]); // When power mode is normal, time for configs updates. mRefreshRateStats->setConfigMode(CONFIG_ID_60); + ninety = mRefreshRateStats->getTotalTimes()["90fps"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); - ASSERT_LT(sixty, times["60fps"]); - sixty = times["60fps"]; + EXPECT_EQ(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); + EXPECT_LT(sixty, times["60fps"]); mRefreshRateStats->setConfigMode(CONFIG_ID_90); + sixty = mRefreshRateStats->getTotalTimes()["60fps"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(screenOff, times["ScreenOff"]); - ASSERT_LT(ninety, times["90fps"]); - ASSERT_EQ(sixty, times["60fps"]); - ninety = times["90fps"]; + EXPECT_EQ(screenOff, times["ScreenOff"]); + EXPECT_LT(ninety, times["90fps"]); + EXPECT_EQ(sixty, times["60fps"]); mRefreshRateStats->setConfigMode(CONFIG_ID_60); + ninety = mRefreshRateStats->getTotalTimes()["90fps"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_EQ(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); - ASSERT_LT(sixty, times["60fps"]); - sixty = times["60fps"]; + EXPECT_EQ(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); + EXPECT_LT(sixty, times["60fps"]); // Because the power mode is not HWC_POWER_MODE_NORMAL, switching the config // does not update refresh rates that come from the config. mRefreshRateStats->setPowerMode(HWC_POWER_MODE_DOZE); mRefreshRateStats->setConfigMode(CONFIG_ID_90); + sixty = mRefreshRateStats->getTotalTimes()["60fps"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); - ASSERT_EQ(sixty, times["60fps"]); - screenOff = times["ScreenOff"]; + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); + EXPECT_EQ(sixty, times["60fps"]); mRefreshRateStats->setConfigMode(CONFIG_ID_60); + screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"]; std::this_thread::sleep_for(std::chrono::milliseconds(2)); times = mRefreshRateStats->getTotalTimes(); - ASSERT_LT(screenOff, times["ScreenOff"]); - ASSERT_EQ(ninety, times["90fps"]); - ASSERT_EQ(sixty, times["60fps"]); + EXPECT_LT(screenOff, times["ScreenOff"]); + EXPECT_EQ(ninety, times["90fps"]); + EXPECT_EQ(sixty, times["60fps"]); } } // namespace } // namespace scheduler |