From 3ad0d9bba90e3663e4b6124eccb31e9e54d6d8f8 Mon Sep 17 00:00:00 2001 From: volcano6322 Date: Wed, 26 Jul 2023 07:58:59 +0000 Subject: [PATCH] fixed e7a2e44 from https://gitee.com/volcano6322/powermgr_display_manager/pulls/316 fix: DisplayMockObject Test_ 001 failed problem-solving Signed-off-by: volcano6322 --- .../src/mock/display_mock_object_test.cpp | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/test/unittest/src/mock/display_mock_object_test.cpp b/test/unittest/src/mock/display_mock_object_test.cpp index 178edf0..c099bf8 100644 --- a/test/unittest/src/mock/display_mock_object_test.cpp +++ b/test/unittest/src/mock/display_mock_object_test.cpp @@ -30,15 +30,11 @@ namespace { static constexpr uint32_t BRIGHTNESS_SETTING_VALUE = 50; static constexpr uint32_t BRIGHTNESS_OVERRIDE_VALUE = 100; static constexpr uint32_t BRIGHTNESS_DURATION = 0; -static constexpr uint32_t BRIGHTNESS_DEFAULT_VALUE = 102; -static constexpr uint32_t BRIGHTNESS_MIN_VALUE = 5; -static constexpr uint32_t BRIGHTNESS_MAX_VALUE = 255; static constexpr uint32_t BRIGHTNESS_NONE_VALUE = 0; static constexpr uint32_t DISPLAY_ID = 0; static constexpr uint32_t MAIN_ID_PROXY = 0; static constexpr uint32_t REASON = 0; static constexpr int32_t BRIGHTNESS_ADJUST_VALUE = 150; -static constexpr int32_t MAIN_ID_CLIENT = 0; static constexpr int32_t TIMEOUT_MS = 500; static constexpr double DISCOUNT_VALUE = 0.30; } // namespace @@ -82,33 +78,4 @@ HWTEST_F(DisplayMockObjectTest, DisplayMockObjectTest_001, TestSize.Level0) EXPECT_FALSE(sptrDisplayProxy->BoostBrightness(TIMEOUT_MS, DISPLAY_ID)); EXPECT_FALSE(sptrDisplayProxy->CancelBoostBrightness(DISPLAY_ID)); } - -/** - * @tc.name: DisplayMockObjectTest_001 - * @tc.desc: test DisplayPowerMgrClient - * @tc.type: FUNC - * @tc.require: issueI5YZQR - */ -HWTEST_F(DisplayMockObjectTest, DisplayMockObjectTest_002, TestSize.Level0) -{ - auto& client = DisplayPowerMgrClient::GetInstance(); - std::vector result; - result.push_back(DISPLAY_ID); - EXPECT_TRUE(client.SetDisplayState(DisplayPowerMgr::DisplayState::DISPLAY_ON)); - EXPECT_EQ(DisplayPowerMgr::DisplayState::DISPLAY_ON, client.GetDisplayState(DISPLAY_ID)); - EXPECT_EQ(result, client.GetDisplayIds()); - EXPECT_EQ(MAIN_ID_CLIENT, client.GetMainDisplayId()); - EXPECT_TRUE(client.SetBrightness(BRIGHTNESS_SETTING_VALUE, DISPLAY_ID)); - EXPECT_TRUE(client.DiscountBrightness(DISCOUNT_VALUE, DISPLAY_ID)); - EXPECT_TRUE(client.OverrideBrightness(BRIGHTNESS_OVERRIDE_VALUE, DISPLAY_ID)); - EXPECT_TRUE(client.RestoreBrightness(DISPLAY_ID)); - EXPECT_EQ(BRIGHTNESS_SETTING_VALUE, client.GetBrightness(DISPLAY_ID)); - EXPECT_EQ(BRIGHTNESS_SETTING_VALUE * DISCOUNT_VALUE, client.GetDeviceBrightness(DISPLAY_ID)); - EXPECT_EQ(BRIGHTNESS_DEFAULT_VALUE, client.GetDefaultBrightness()); - EXPECT_EQ(BRIGHTNESS_MAX_VALUE, client.GetMaxBrightness()); - EXPECT_EQ(BRIGHTNESS_MIN_VALUE, client.GetMinBrightness()); - EXPECT_TRUE(client.AdjustBrightness(BRIGHTNESS_ADJUST_VALUE, BRIGHTNESS_DURATION, DISPLAY_ID)); - EXPECT_TRUE(client.BoostBrightness(TIMEOUT_MS, DISPLAY_ID)); - EXPECT_TRUE(client.CancelBoostBrightness(DISPLAY_ID)); -} -} // namespace +} //namespace -- Gitee