From 082c1f73e2df99d930e22bd9ce7eadd02bb0c125 Mon Sep 17 00:00:00 2001 From: youshugen Date: Thu, 24 Apr 2025 17:05:08 +0800 Subject: [PATCH] fix: alarming improve Signed-off-by: youshugen --- brightness_manager/BUILD.gn | 8 +- .../include/brightness_dimming.h | 6 +- brightness_manager/include/brightness_ffrt.h | 41 ---- .../include/brightness_service.h | 9 +- .../include/calculation_curve.h | 1 + .../include/calculation_manager.h | 2 + brightness_manager/src/brightness_action.cpp | 3 +- brightness_manager/src/brightness_dimming.cpp | 12 +- brightness_manager/src/brightness_service.cpp | 90 ++++---- .../src/calculation_manager.cpp | 4 +- brightness_manager/src/light_lux_manager.cpp | 2 + brightness_manager/test/unittest/BUILD.gn | 2 +- .../src/brightness_manager_ext_test.cpp | 18 +- .../unittest/src/brightness_manager_test.cpp | 6 +- .../unittest/src/brightness_service_test.cpp | 6 +- bundle.json | 12 +- displaymgr.gni | 8 - state_manager/frameworks/napi/BUILD.gn | 6 +- .../frameworks/napi/brightness_module.cpp | 4 - state_manager/interfaces/inner_api/BUILD.gn | 10 +- state_manager/service/BUILD.gn | 8 +- .../include/display_power_mgr_service.h | 1 + .../service/native/include/gradual_animator.h | 3 + .../service/native/include/screen_action.h | 1 + .../native/include/screen_controller.h | 4 +- .../native/src/display_power_mgr_service.cpp | 5 +- .../native/src/display_system_ability.cpp | 6 +- .../service/native/src/screen_action.cpp | 8 +- .../service/native/src/screen_controller.cpp | 6 +- state_manager/test/fuzztest/BUILD.gn | 1 - .../fuzztest/adjustbrightness_fuzzer/BUILD.gn | 4 +- .../autoadjustbrightness_fuzzer/BUILD.gn | 4 +- .../fuzztest/boostbrightness_fuzzer/BUILD.gn | 4 +- .../discountbrightness_fuzzer/BUILD.gn | 4 +- .../fuzztest/displaycoverage_fuzzer/BUILD.gn | 99 --------- .../displaycoverage_fuzzer/corpus/init | 14 -- .../displaycoverage_fuzzer_test.cpp | 51 ----- .../displaycoverage_fuzzer_test.h | 20 -- .../displaycoverage_fuzzer/project.xml | 25 --- .../fuzztest/displaystate_fuzzer/BUILD.gn | 4 +- .../fuzztest/getbrightness_fuzzer/BUILD.gn | 4 +- .../fuzztest/getdisplayid_fuzzer/BUILD.gn | 4 +- .../overridebrightness_fuzzer/BUILD.gn | 4 +- .../overridedisplayoffdelay_fuzzer/BUILD.gn | 4 +- .../fuzztest/registercallback_fuzzer/BUILD.gn | 4 +- .../fuzztest/setbrightness_fuzzer/BUILD.gn | 4 +- .../fuzztest/setcoordinated_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../fuzztest/setmaxbrightness_fuzzer/BUILD.gn | 4 +- state_manager/test/unittest/BUILD.gn | 1 - .../src/display_power_mgr_brightness_test.cpp | 202 +++++++++--------- .../src/display_power_mgr_service_test.cpp | 83 +++---- .../src/display_service_death_test.cpp | 2 +- .../src/mock/display_mock_object_test.cpp | 4 +- .../src/mock/display_mock_parcel_test.cpp | 18 +- .../unittest/src/mock/display_mock_test.cpp | 14 +- 56 files changed, 266 insertions(+), 616 deletions(-) delete mode 100644 brightness_manager/include/brightness_ffrt.h delete mode 100644 state_manager/test/fuzztest/displaycoverage_fuzzer/BUILD.gn delete mode 100644 state_manager/test/fuzztest/displaycoverage_fuzzer/corpus/init delete mode 100644 state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.cpp delete mode 100644 state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.h delete mode 100644 state_manager/test/fuzztest/displaycoverage_fuzzer/project.xml diff --git a/brightness_manager/BUILD.gn b/brightness_manager/BUILD.gn index a52b6b9..95ebf02 100644 --- a/brightness_manager/BUILD.gn +++ b/brightness_manager/BUILD.gn @@ -52,14 +52,13 @@ ohos_static_library("brightness_manager") { ] external_deps = [ - "ability_base:zuri", "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "ffrt:libffrt", - "graphic_2d:librender_service_base", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "jsoncpp:jsoncpp", @@ -72,6 +71,7 @@ ohos_static_library("brightness_manager") { "window_manager:libdm_lite", ] + defines = [] if (use_libfuzzer) { defines += [ "FUZZ_TEST" ] } @@ -83,9 +83,7 @@ ohos_static_library("brightness_manager") { if (display_manager_feature_brightnessext != "") { defines += [ "OHOS_BUILD_ENABLE_BRIGHTNESS_WRAPPER" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } + subsystem_name = "powermgr" part_name = "${displaymgr_part_name}" } diff --git a/brightness_manager/include/brightness_dimming.h b/brightness_manager/include/brightness_dimming.h index 5eb47a2..a7ca40a 100644 --- a/brightness_manager/include/brightness_dimming.h +++ b/brightness_manager/include/brightness_dimming.h @@ -18,12 +18,15 @@ #include #include +#include +#include +#include "ffrt_utils.h" #include #include #include #include "brightness_dimming_callback.h" -#include "brightness_ffrt.h" +#include "inner_event.h" namespace OHOS { namespace DisplayPowerMgr { @@ -60,7 +63,6 @@ private: std::atomic_uint32_t mCurrentBrightness{}; std::atomic_uint32_t mCurrentStep{}; std::shared_ptr mQueue; - std::mutex mAnimatorHandleLock{}; }; } // namespace DisplayPowerMgr } // namespace OHOS diff --git a/brightness_manager/include/brightness_ffrt.h b/brightness_manager/include/brightness_ffrt.h deleted file mode 100644 index 7e7e323..0000000 --- a/brightness_manager/include/brightness_ffrt.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef BRIGHTNESS_FFRT_H -#define BRIGHTNESS_FFRT_H - -#include "display_log.h" -#include "ffrt_utils.h" - -namespace OHOS { -namespace DisplayPowerMgr { - -inline void FFRT_CANCEL(PowerMgr::FFRTHandle& handle, std::shared_ptr& queue) -{ - if (!(handle) || !(queue)) { - DISPLAY_HILOGW(FEAT_BRIGHTNESS, "FFRT_CANCEL, queue or handle is null"); - return; - } - int ret = PowerMgr::FFRTUtils::CancelTask(handle, queue); - if (ret != 0) { - DISPLAY_HILOGW(FEAT_BRIGHTNESS, "FFRT_CANCEL, cancel fail: %{public}d", ret); - } else { - handle = nullptr; - } -} -} // DisplayPowerMgr -} // OHOS - -#endif \ No newline at end of file diff --git a/brightness_manager/include/brightness_service.h b/brightness_manager/include/brightness_service.h index 53191a5..49c0b9c 100644 --- a/brightness_manager/include/brightness_service.h +++ b/brightness_manager/include/brightness_service.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -34,11 +34,12 @@ #include "display_power_info.h" #include "display_manager_lite.h" #include "dm_common.h" +#include "event_runner.h" #include "iremote_object.h" #include "idisplay_brightness_callback.h" #include "light_lux_manager.h" #include "refbase.h" -#include "brightness_ffrt.h" +#include "ffrt_utils.h" #ifdef ENABLE_SENSOR_PART #include "sensor_agent_type.h" #endif @@ -209,6 +210,7 @@ private: bool mIsFoldDevice{false}; bool mIsAutoBrightnessEnabled{false}; DisplayState mState{DisplayState::DISPLAY_UNKNOWN}; + uint32_t mStateChangeReason{0}; uint32_t mBrightnessLevel{0}; std::atomic mBrightnessTarget{0}; uint32_t mDisplayId{0}; @@ -232,9 +234,6 @@ private: std::atomic mIsDisplayOnWhenFirstLuxReport{false}; std::atomic mWaitForFirstLux{false}; std::atomic mCurrentBrightness{DEFAULT_BRIGHTNESS}; - std::once_flag mInitCallFlag; - std::mutex mBoostHandleLock{}; - std::mutex mFirstLuxHandleLock{}; }; } // namespace DisplayPowerMgr } // namespace OHOS diff --git a/brightness_manager/include/calculation_curve.h b/brightness_manager/include/calculation_curve.h index 4455d2a..76375e4 100644 --- a/brightness_manager/include/calculation_curve.h +++ b/brightness_manager/include/calculation_curve.h @@ -49,6 +49,7 @@ private: float GetBrightnessCurveLevel(std::vector& linePointsList, float lux); Config mCurveConfig{}; + uint32_t mDisplayId {0}; float mDefaultBrightness {100.0f}; float mCurveAmbientLux {0.0f}; int mCurrentUserId {0}; diff --git a/brightness_manager/include/calculation_manager.h b/brightness_manager/include/calculation_manager.h index aa7b269..2c82f86 100644 --- a/brightness_manager/include/calculation_manager.h +++ b/brightness_manager/include/calculation_manager.h @@ -69,9 +69,11 @@ private: void ResetDefaultBrightnessOffset(); BrightnessCalculationCurve mBrightnessCalculationCurve{}; + uint32_t mDisplayId{0}; int mCurrentUserId{0}; bool mIsCameraCurveEnable{false}; bool mIsGameCurveEnable{false}; + float mDefaultBrightness{false}; float mDelta{0.0f}; float mOffsetLux{0.0f}; float mPosBrightness{0.0f}; diff --git a/brightness_manager/src/brightness_action.cpp b/brightness_manager/src/brightness_action.cpp index 7f2b2ab..6ae950e 100644 --- a/brightness_manager/src/brightness_action.cpp +++ b/brightness_manager/src/brightness_action.cpp @@ -14,9 +14,8 @@ */ #include "brightness_action.h" -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART + #include -#endif #include #include "display_log.h" diff --git a/brightness_manager/src/brightness_dimming.cpp b/brightness_manager/src/brightness_dimming.cpp index f30f546..5310236 100644 --- a/brightness_manager/src/brightness_dimming.cpp +++ b/brightness_manager/src/brightness_dimming.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,6 +17,7 @@ #include "brightness_dimming_callback.h" #include "display_log.h" +#include "ffrt_utils.h" namespace OHOS { namespace DisplayPowerMgr { @@ -94,16 +95,17 @@ void BrightnessDimming::StartDimming(uint32_t from, uint32_t to, uint32_t durati mCurrentStep = 0; mDimming = true; FFRTTask task = [this] { this->NextStep(); }; - std::lock_guard lock(mAnimatorHandleLock); g_animatorTaskHandle = FFRTUtils::SubmitDelayTask(task, mUpdateTime, mQueue); } void BrightnessDimming::StopDimming() { mDimming = false; - mAnimatorHandleLock.lock(); - FFRT_CANCEL(g_animatorTaskHandle, mQueue); - mAnimatorHandleLock.unlock(); + if (g_animatorTaskHandle == nullptr) { + DISPLAY_HILOGW(FEAT_BRIGHTNESS, "handle is nullptr"); + } else { + FFRTUtils::CancelTask(g_animatorTaskHandle, mQueue); + } if (mCallback == nullptr) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "Callback is nullptr"); return; diff --git a/brightness_manager/src/brightness_service.cpp b/brightness_manager/src/brightness_service.cpp index c7a1976..877514b 100644 --- a/brightness_manager/src/brightness_service.cpp +++ b/brightness_manager/src/brightness_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,7 @@ #include "brightness_service.h" #include -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include -#endif #include #include @@ -51,6 +49,7 @@ constexpr uint32_t MAX_DEFAULT_BRGIHTNESS_LEVEL = 255; constexpr uint32_t MIN_DEFAULT_BRGIHTNESS_LEVEL = 1; constexpr uint32_t MAX_MAPPING_BRGIHTNESS_LEVEL = 223; constexpr uint32_t MIN_MAPPING_BRGIHTNESS_LEVEL = 1; +constexpr uint32_t MAX_HBM_BRGIHTNESS_NIT = 1000; constexpr uint32_t MAX_DEFAULT_BRGIHTNESS_NIT = 600; constexpr uint32_t MIN_DEFAULT_BRGIHTNESS_NIT = 2; constexpr uint32_t MAX_DEFAULT_HIGH_BRGIHTNESS_LEVEL = 10000; @@ -99,32 +98,30 @@ BrightnessService& BrightnessService::Get() void BrightnessService::Init(uint32_t defaultMax, uint32_t defaultMin) { - std::call_once(mInitCallFlag, [defaultMax, defaultMin, this] { - queue_ = std::make_shared ("brightness_manager"); - if (queue_ == nullptr) { - return; - } - if (!mDimming->Init()) { - return; - } + queue_ = std::make_shared ("brightness_manager"); + if (queue_ == nullptr) { + return; + } + if (!mDimming->Init()) { + return; + } #ifdef ENABLE_SENSOR_PART - InitSensors(); - mIsFoldDevice = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); - DISPLAY_HILOGI(FEAT_BRIGHTNESS, "Init mIsFoldDevice=%{public}d", mIsFoldDevice); + InitSensors(); + mIsFoldDevice = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); + DISPLAY_HILOGI(FEAT_BRIGHTNESS, "Init mIsFoldDevice=%{public}d", mIsFoldDevice); #endif - ConfigParse::Get().Initialize(); - mLightLuxManager.InitParameters(); - mBrightnessCalculationManager.InitParameters(); - - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); - brightnessValueMax = defaultMax; - brightnessValueMin = defaultMin; - DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::init isFoldable=%{public}d, max=%{public}u, min=%{public}u", - isFoldable, brightnessValueMax, brightnessValueMin); - if (isFoldable) { - RegisterFoldStatusListener(); - } - }); + ConfigParse::Get().Initialize(); + mLightLuxManager.InitParameters(); + mBrightnessCalculationManager.InitParameters(); + + bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); + brightnessValueMax = defaultMax; + brightnessValueMin = defaultMin; + DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::init isFoldable=%{public}d, max=%{public}u, min=%{public}u", + isFoldable, brightnessValueMax, brightnessValueMin); + if (isFoldable) { + RegisterFoldStatusListener(); + } } void BrightnessService::DeInit() @@ -638,10 +635,8 @@ void BrightnessService::ProcessLightLux(float lux) mLuxLevel = index; // Notify ambient lux change event to battery statistics // type:0 auto brightness, 1 manual brightness, 2 window brightness, 3 others -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::DISPLAY, "AMBIENT_LIGHT", HiviewDFX::HiSysEvent::EventType::STATISTIC, "LEVEL", mLuxLevel, "TYPE", 0); -#endif } break; } @@ -668,8 +663,7 @@ void BrightnessService::UpdateCurrentBrightnessLevel(float lux, bool isFastDurat mBrightnessLevel = brightnessLevel; mCurrentBrightness.store(brightnessLevel); if (mWaitForFirstLux) { - std::lock_guard lock(mFirstLuxHandleLock); - FFRT_CANCEL(g_waitForFirstLuxTaskHandle, queue_); + FFRTUtils::CancelTask(g_waitForFirstLuxTaskHandle, queue_); mWaitForFirstLux = false; DISPLAY_HILOGI(FEAT_BRIGHTNESS, "UpdateCurrentBrightnessLevel CancelScreenOn waitforFisrtLux Task"); } @@ -697,6 +691,7 @@ uint32_t BrightnessService::GetBrightnessLevel(float lux) uint32_t BrightnessService::GetBrightnessHighLevel(uint32_t level) { + uint32_t brightnessHighLevel = level; return level; } @@ -729,21 +724,16 @@ void BrightnessService::SetScreenOnBrightness() { uint32_t screenOnBrightness = GetScreenOnBrightness(true); if (mWaitForFirstLux) { - std::lock_guard lock(mFirstLuxHandleLock); - if (queue_ == nullptr) { - DISPLAY_HILOGW(FEAT_BRIGHTNESS, "SetScreenOnBrightness, queue is null"); - } else { - DISPLAY_HILOGI(FEAT_BRIGHTNESS, "SetScreenOnBrightness waitForFirstLux"); - FFRT_CANCEL(g_waitForFirstLuxTaskHandle, queue_); - screenOnBrightness = mCachedSettingBrightness; - DISPLAY_HILOGI(FEAT_BRIGHTNESS, "SetScreenOnBrightness waitForFirstLux,GetSettingBrightness=%{public}d", - screenOnBrightness); - FFRTTask setBrightnessTask = [this, screenOnBrightness] { - this->UpdateBrightness(screenOnBrightness, 0, true); - }; - g_waitForFirstLuxTaskHandle = FFRTUtils::SubmitDelayTask(setBrightnessTask, WAIT_FOR_FIRST_LUX_MAX_TIME, - queue_); - } + DISPLAY_HILOGI(FEAT_BRIGHTNESS, "SetScreenOnBrightness waitForFirstLux"); + FFRTUtils::CancelTask(g_waitForFirstLuxTaskHandle, queue_); + screenOnBrightness = mCachedSettingBrightness; + DISPLAY_HILOGI(FEAT_BRIGHTNESS, "SetScreenOnBrightness waitForFirstLux,GetSettingBrightness=%{public}d", + screenOnBrightness); + FFRTTask setBrightnessTask = [this, screenOnBrightness] { + this->UpdateBrightness(screenOnBrightness, 0, true); + }; + g_waitForFirstLuxTaskHandle = FFRTUtils::SubmitDelayTask(setBrightnessTask, WAIT_FOR_FIRST_LUX_MAX_TIME, + queue_); return; } bool needUpdateBrightness = true; @@ -876,7 +866,7 @@ bool BrightnessService::BoostBrightness(uint32_t timeoutMs, uint32_t gradualDura } // If boost multi-times, we will resend the cancel boost event. - FFRT_CANCEL(g_cancelBoostTaskHandle, queue_); + FFRTUtils::CancelTask(g_cancelBoostTaskHandle, queue_); FFRTTask task = [this, gradualDuration] { this->CancelBoostBrightness(gradualDuration); }; g_cancelBoostTaskHandle = FFRTUtils::SubmitDelayTask(task, timeoutMs, queue_); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BoostBrightness update timeout=%{public}u, isSuccess=%{public}d", timeoutMs, @@ -891,9 +881,7 @@ bool BrightnessService::CancelBoostBrightness(uint32_t gradualDuration) DISPLAY_HILOGD(FEAT_BRIGHTNESS, "Brightness is not boost, no need to restore"); return false; } - mBoostHandleLock.lock(); - FFRT_CANCEL(g_cancelBoostTaskHandle, queue_); - mBoostHandleLock.unlock(); + FFRTUtils::CancelTask(g_cancelBoostTaskHandle, queue_); mIsBrightnessBoosted = false; return UpdateBrightness(mCachedSettingBrightness, gradualDuration, true); } @@ -1137,10 +1125,8 @@ void BrightnessService::ReportBrightnessBigData(uint32_t brightness) std::string reason = GetReason(); uint32_t nit = GetMappingBrightnessNit(brightness); // Notify screen brightness change event to battery statistics -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::DISPLAY, "BRIGHTNESS_NIT", HiviewDFX::HiSysEvent::EventType::STATISTIC, "BRIGHTNESS", brightness, "REASON", reason, "NIT", nit); -#endif DISPLAY_HILOGD(FEAT_BRIGHTNESS, "BigData brightness=%{public}d,reason=%{public}s,nit=%{public}d", brightness, reason.c_str(), nit); } diff --git a/brightness_manager/src/calculation_manager.cpp b/brightness_manager/src/calculation_manager.cpp index 88cc91d..b07bc1a 100644 --- a/brightness_manager/src/calculation_manager.cpp +++ b/brightness_manager/src/calculation_manager.cpp @@ -33,12 +33,14 @@ constexpr float DEFAULT_OFFSET_DELTA = 0.0f; constexpr float SMALL_VALUE = 1e-6f; constexpr float DEFAULT_OFFSET_RATIO = 1.0f; constexpr float MIN_OFFSET_RATIO = 0.0f; +constexpr float DEFAULT_MIN_DELTA = 1.0f; constexpr float MIN_DEFAULT_BRIGHTNESS = 4.0f; constexpr float MAX_DEFAULT_BRIGHTNESS = 255.0f; constexpr float AMBIENT_VALID_MAX_LUX = 40000; constexpr float AMBIENT_VALID_MIN_LUX = 0.0f; -} // namespace +constexpr float DEFAULT_BRIGHTNESS = 100.0f; +} void BrightnessCalculationManager::InitParameters() { diff --git a/brightness_manager/src/light_lux_manager.cpp b/brightness_manager/src/light_lux_manager.cpp index ee48264..5e58de0 100644 --- a/brightness_manager/src/light_lux_manager.cpp +++ b/brightness_manager/src/light_lux_manager.cpp @@ -24,7 +24,9 @@ namespace DisplayPowerMgr { namespace { const int LIGHT_LUX_BUFFER_RANGE = 10000; const int LIGHT_MAX_LUX = 40000; +const int AMBIENT_THRESHOLD_LOWLIGHT = 20; const int LIGHT_LUX_BUFFER_MIN = 5; +const int LIGHT_LUX_MAX_COLORTEMP = 2000; const int INVALID_VALUE = -1; const int LOG_INTERVAL_MS = 2000; const int LUX_BUFFER_NUM_FOR_LOG = 6; diff --git a/brightness_manager/test/unittest/BUILD.gn b/brightness_manager/test/unittest/BUILD.gn index 68eba32..02040b4 100644 --- a/brightness_manager/test/unittest/BUILD.gn +++ b/brightness_manager/test/unittest/BUILD.gn @@ -24,7 +24,7 @@ config("module_private_config") { } set_defaults("ohos_unittest") { - module_out_path = "display_manager/brightness_manager" + module_out_path = "${displaymgr_part_name}/brightness_manager/test" configs = [ "${brightnessmgr_root_path}:brightness_manager_config", diff --git a/brightness_manager/test/unittest/src/brightness_manager_ext_test.cpp b/brightness_manager/test/unittest/src/brightness_manager_ext_test.cpp index 53ee70e..eea9056 100644 --- a/brightness_manager/test/unittest/src/brightness_manager_ext_test.cpp +++ b/brightness_manager/test/unittest/src/brightness_manager_ext_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,7 +40,7 @@ class BrightnessManagerExtTest : public Test {}; namespace { HWTEST_F(BrightnessManagerExtTest, NoInit, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerNoInit001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerNoInit001: fun is start"); bool retBool = g_BrightnessManagerExt.AutoAdjustBrightness(true); EXPECT_FALSE(retBool); @@ -96,12 +96,12 @@ HWTEST_F(BrightnessManagerExtTest, NoInit, TestSize.Level0) retBool = g_BrightnessManagerExt.SetMaxBrightnessNit(100); EXPECT_FALSE(retBool); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerNoInit001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerNoInit001: fun is end"); } HWTEST_F(BrightnessManagerExtTest, MockInit001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerMockInit001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerMockInit001: fun is start"); // 打桩 MockInitBrightnessManagerExt(g_BrightnessManagerExt); MockClearValues(); @@ -153,12 +153,12 @@ HWTEST_F(BrightnessManagerExtTest, MockInit001, TestSize.Level0) retBool = g_BrightnessManagerExt.RestoreBrightness(0); MockClearValues(); EXPECT_TRUE(retBool); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerMockInit001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerMockInit001: fun is end"); } HWTEST_F(BrightnessManagerExtTest, MockInit002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerMockInit002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerMockInit002: fun is start"); MockSetValue(8.0); usleep(DEFAULT_WAITING_TIME); bool retBool = g_BrightnessManagerExt.BoostBrightness(0, 0); @@ -214,19 +214,19 @@ HWTEST_F(BrightnessManagerExtTest, MockInit002, TestSize.Level0) retBool = g_BrightnessManagerExt.SetMaxBrightnessNit(1.0); MockClearValues(); EXPECT_TRUE(retBool); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerMockInit002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerMockInit002: fun is end"); } HWTEST_F(BrightnessManagerExtTest, Init, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerExtInit001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerExtInit001: fun is start"); MockDeInitBrightnessManagerExt(g_BrightnessManagerExt); MockClearValues(); g_BrightnessManagerExt.Init(MIN_DEFAULT_BRIGHTNESS_LEVEL, MAX_DEFAULT_BRIGHTNESS_LEVEL); usleep(INIT_WAITING_TIME); double discount = g_BrightnessManagerExt.GetDiscount(); EXPECT_EQ(1.0, discount); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerExtInit001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerExtInit001: fun is end"); } } // namespace \ No newline at end of file diff --git a/brightness_manager/test/unittest/src/brightness_manager_test.cpp b/brightness_manager/test/unittest/src/brightness_manager_test.cpp index 574e3b8..d208142 100644 --- a/brightness_manager/test/unittest/src/brightness_manager_test.cpp +++ b/brightness_manager/test/unittest/src/brightness_manager_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -46,11 +46,11 @@ public: namespace { HWTEST_F(BrightnessManagerTest, BrightnessManagerGet001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerGet001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerGet001: fun is start"); auto& brightnessManager = BrightnessManager::Get(); EXPECT_NE(&brightnessManager, nullptr); const int sleepTime = 100000; usleep(sleepTime); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessManagerGet001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessManagerGet001: fun is end"); } } // namespace diff --git a/brightness_manager/test/unittest/src/brightness_service_test.cpp b/brightness_manager/test/unittest/src/brightness_service_test.cpp index 84d301d..62d9f88 100644 --- a/brightness_manager/test/unittest/src/brightness_service_test.cpp +++ b/brightness_manager/test/unittest/src/brightness_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -46,9 +46,9 @@ public: namespace { HWTEST_F(BrightnessServiceTest, BrightnessServiceGet001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BrightnessServiceGet001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessServiceGet001: fun is start"); auto& brightnessService = BrightnessService::Get(); EXPECT_NE(&brightnessService, nullptr); - DISPLAY_HILOGD(LABEL_TEST, "BrightnessServiceGet001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessServiceGet001: fun is end"); } } // namespace \ No newline at end of file diff --git a/bundle.json b/bundle.json index 3b15b89..7bf475b 100644 --- a/bundle.json +++ b/bundle.json @@ -28,14 +28,11 @@ ], "deps": { "components": [ - "ability_base", "ability_runtime", "c_utils", "data_share", - "ets_runtime", "eventhandler", "ffrt", - "graphic_2d", "hicollie", "hisysevent", "hiview", @@ -69,7 +66,14 @@ }, "inner_api": [ { - "name": "//base/powermgr/display_manager/state_manager/interfaces/inner_api:displaymgr" + "name": "//base/powermgr/display_manager/state_manager/interfaces/inner_api:displaymgr", + "header": { + "header_files": [ + "display_power_info.h", + "display_power_mgr_client.h" + ], + "header_base": "//base/powermgr/display_manager/state_manager/interfaces/inner_api/native/include" + } } ], "test": [ diff --git a/displaymgr.gni b/displaymgr.gni index 5e947aa..7f74d04 100644 --- a/displaymgr.gni +++ b/displaymgr.gni @@ -24,14 +24,6 @@ declare_args() { } display_manager_feature_brightnessext = "" - if (!defined(global_parts_info) || - defined(global_parts_info.hiviewdfx_hisysevent)) { - has_hiviewdfx_hisysevent_part = true - defines += [ "HAS_HIVIEWDFX_HISYSEVENT_PART" ] - } else { - has_hiviewdfx_hisysevent_part = false - } - if (!defined(global_parts_info) || defined(global_parts_info.hiviewdfx_hiview)) { has_dfx_hiview_part = true diff --git a/state_manager/frameworks/napi/BUILD.gn b/state_manager/frameworks/napi/BUILD.gn index 769ffcd..4f570a3 100644 --- a/state_manager/frameworks/napi/BUILD.gn +++ b/state_manager/frameworks/napi/BUILD.gn @@ -31,17 +31,13 @@ ohos_shared_library("brightness") { external_deps = [ "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", + "hiview:libxpower_event_js", "ipc:ipc_core", "napi:ace_napi", "power_manager:powermgr_client", ] - if (has_dfx_hiview_part) { - external_deps += [ "hiview:libxpower_event_js" ] - } - relative_install_dir = "module" subsystem_name = "powermgr" diff --git a/state_manager/frameworks/napi/brightness_module.cpp b/state_manager/frameworks/napi/brightness_module.cpp index 62c3788..ea3e6a7 100644 --- a/state_manager/frameworks/napi/brightness_module.cpp +++ b/state_manager/frameworks/napi/brightness_module.cpp @@ -29,9 +29,7 @@ #include "display_common.h" #include "display_log.h" #include "power_mgr_client.h" -#ifdef HAS_DFX_HIVIEW_PART #include "xpower_event_js.h" -#endif using namespace OHOS::DisplayPowerMgr; using namespace OHOS::PowerMgr; @@ -112,9 +110,7 @@ static napi_value SetValue(napi_env env, napi_callback_info info) if (res != nullptr) { Brightness brightness(env); brightness.SetValue(info); -#ifdef HAS_DFX_HIVIEW_PART OHOS::HiviewDFX::ReportXPowerJsStackSysEvent(env, "Brightness::SetValue"); -#endif } return nullptr; } diff --git a/state_manager/interfaces/inner_api/BUILD.gn b/state_manager/interfaces/inner_api/BUILD.gn index 8a05721..cf2892d 100644 --- a/state_manager/interfaces/inner_api/BUILD.gn +++ b/state_manager/interfaces/inner_api/BUILD.gn @@ -18,10 +18,7 @@ config("displaymgr_private_config") { } config("displaymgr_public_config") { - include_dirs = [ - "native/include", - "${displaymgr_utils_path}/native/include", - ] + include_dirs = [ "native/include" ] } ohos_shared_library("displaymgr") { @@ -39,7 +36,10 @@ ohos_shared_library("displaymgr") { "${displaymgr_utils_path}:coverage_flags", ] - public_configs = [ ":displaymgr_public_config" ] + public_configs = [ + "${displaymgr_utils_path}:utils_config", + ":displaymgr_public_config", + ] external_deps = [ "c_utils:utils", diff --git a/state_manager/service/BUILD.gn b/state_manager/service/BUILD.gn index 85ad61e..8c72dae 100644 --- a/state_manager/service/BUILD.gn +++ b/state_manager/service/BUILD.gn @@ -62,15 +62,13 @@ ohos_shared_library("displaymgrservice") { external_deps = [ "power_manager:power_permission" ] external_deps += [ - "ability_base:zuri", "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", - "eventhandler:libeventhandler", "ffrt:libffrt", - "graphic_2d:librender_service_base", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -79,7 +77,6 @@ ohos_shared_library("displaymgrservice") { "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "skia:skia_canvaskit", "window_manager:libdm_lite", ] @@ -88,9 +85,6 @@ ohos_shared_library("displaymgrservice") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/service/native/include/display_power_mgr_service.h b/state_manager/service/native/include/display_power_mgr_service.h index 80b418b..c271a68 100644 --- a/state_manager/service/native/include/display_power_mgr_service.h +++ b/state_manager/service/native/include/display_power_mgr_service.h @@ -26,6 +26,7 @@ #include #include "delayed_sp_singleton.h" #include "refbase.h" +#include "event_runner.h" #include "iremote_object.h" #ifdef ENABLE_SENSOR_PART #include "sensor_agent_type.h" diff --git a/state_manager/service/native/include/gradual_animator.h b/state_manager/service/native/include/gradual_animator.h index 6d2053a..ef8cbb4 100644 --- a/state_manager/service/native/include/gradual_animator.h +++ b/state_manager/service/native/include/gradual_animator.h @@ -20,6 +20,9 @@ #include #include #include +#include +#include +#include "inner_event.h" namespace OHOS { namespace DisplayPowerMgr { diff --git a/state_manager/service/native/include/screen_action.h b/state_manager/service/native/include/screen_action.h index 5bd0f61..088e51b 100644 --- a/state_manager/service/native/include/screen_action.h +++ b/state_manager/service/native/include/screen_action.h @@ -52,6 +52,7 @@ private: uint32_t brightness_ {102}; uint32_t displayId_ {DEFAULT_DISPLAY_ID}; bool coordinated_ {false}; + bool skipSetDisplayState_ {false}; Rosen::PowerStateChangeReason ParseSpecialReason(uint32_t reason); Rosen::DisplayState ParseDisplayState(DisplayState state); }; diff --git a/state_manager/service/native/include/screen_controller.h b/state_manager/service/native/include/screen_controller.h index bf8a38c..ac7b7d6 100644 --- a/state_manager/service/native/include/screen_controller.h +++ b/state_manager/service/native/include/screen_controller.h @@ -34,13 +34,15 @@ public: class AnimateCallbackImpl : public AnimateCallback { public: - explicit AnimateCallbackImpl(std::function callback); + explicit AnimateCallbackImpl(const std::shared_ptr& action, + std::function callback); ~AnimateCallbackImpl() override = default; void OnStart() override; void OnChanged(uint32_t currentValue) override; void OnEnd() override; void DiscountBrightness(double discount) override; private: + const std::shared_ptr& action_; std::function callback_; double discount_ {1.0}; }; diff --git a/state_manager/service/native/src/display_power_mgr_service.cpp b/state_manager/service/native/src/display_power_mgr_service.cpp index 96bd710..17482e3 100644 --- a/state_manager/service/native/src/display_power_mgr_service.cpp +++ b/state_manager/service/native/src/display_power_mgr_service.cpp @@ -14,9 +14,8 @@ */ #include "display_power_mgr_service.h" -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART + #include -#endif #include #include #include @@ -338,10 +337,8 @@ bool DisplayPowerMgrService::DiscountBrightness(double discount, uint32_t displa auto safeDiscount = GetSafeDiscount(discount, brightness); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "DiscountBrightness displayId=%{public}u, discount-%{public}lf", displayId, safeDiscount); -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::DISPLAY, "BACKLIGHT_DISCOUNT", HiviewDFX::HiSysEvent::EventType::STATISTIC, "RATIO", safeDiscount); -#endif return iter->second->DiscountBrightness(safeDiscount); } diff --git a/state_manager/service/native/src/display_system_ability.cpp b/state_manager/service/native/src/display_system_ability.cpp index b0046e9..f3f3c0a 100644 --- a/state_manager/service/native/src/display_system_ability.cpp +++ b/state_manager/service/native/src/display_system_ability.cpp @@ -47,8 +47,8 @@ void DisplaySystemAbility::OnAddSystemAbility(int32_t systemAbilityId, const std if (!Publish(service)) { DISPLAY_HILOGE(COMP_SVC, "Failed to publish service"); } - if (commonEventManager_ != nullptr && commonEventManager_->CheckIfSettingsDataReady() - && commonEventManager_->SetKvDataReady()) { + if (commonEventManager_ != nullptr && commonEventManager_->CheckIfSettingsDataReady() && + commonEventManager_->SetKvDataReady()) { commonEventManager_->HandleBootBrightness(); } isReady = true; @@ -80,8 +80,8 @@ void DisplaySystemAbility::OnStop() DISPLAY_HILOGW(COMP_SVC, "Stop service"); auto service = DelayedSpSingleton::GetInstance(); service->Deinit(); - RemoveSystemAbilityListener(DISPLAY_MANAGER_SERVICE_SA_ID); isReady = false; + RemoveSystemAbilityListener(DISPLAY_MANAGER_SERVICE_SA_ID); } } // OHOS } // DisplayPowerMgr diff --git a/state_manager/service/native/src/screen_action.cpp b/state_manager/service/native/src/screen_action.cpp index 54ef29e..40c3721 100644 --- a/state_manager/service/native/src/screen_action.cpp +++ b/state_manager/service/native/src/screen_action.cpp @@ -15,9 +15,8 @@ #include "screen_action.h" #include -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART + #include -#endif #include #include "display_log.h" @@ -57,7 +56,7 @@ uint32_t ScreenAction::GetDisplayId() DisplayState ScreenAction::GetDisplayState() { DisplayState state = DisplayState::DISPLAY_UNKNOWN; - Rosen::ScreenPowerState powerState = Rosen::ScreenManagerLite::GetInstance().GetScreenPower(displayId_); + Rosen::ScreenPowerState powerState = Rosen::ScreenManagerLite::GetInstance().GetScreenPower(); DISPLAY_HILOGI(FEAT_STATE, "ScreenPowerState=%{public}d", static_cast(powerState)); switch (powerState) { case Rosen::ScreenPowerState::POWER_ON: @@ -140,6 +139,7 @@ bool ScreenAction::SetDisplayState(DisplayState state, const std::function(state)); Rosen::DisplayState rds = ParseDisplayState(state); + std::string identity = IPCSkeleton::ResetCallingIdentity(); bool ret = Rosen::DisplayManagerLite::GetInstance().SetDisplayState(rds, [callback](Rosen::DisplayState rosenState) { @@ -169,10 +169,8 @@ bool ScreenAction::SetDisplayState(DisplayState state, const std::function(state)); -#endif DISPLAY_HILOGI(FEAT_STATE, "[UL_POWER] SetDisplayState: displayId=%{public}u, state=%{public}u, ret=%{public}d", displayId_, static_cast(state), ret); return ret; diff --git a/state_manager/service/native/src/screen_controller.cpp b/state_manager/service/native/src/screen_controller.cpp index 4a63d42..6dfbd59 100644 --- a/state_manager/service/native/src/screen_controller.cpp +++ b/state_manager/service/native/src/screen_controller.cpp @@ -45,14 +45,16 @@ ScreenController::ScreenController(uint32_t displayId) string name = "BrightnessController_" + to_string(displayId); if (animateCallback_ == nullptr) { - animateCallback_ = make_shared([this](uint32_t brightness) { + animateCallback_ = make_shared(action_, [this](uint32_t brightness) { SetSettingBrightness(brightness); }); } animator_ = make_shared(name, animateCallback_); } -ScreenController::AnimateCallbackImpl::AnimateCallbackImpl(std::function callback) : callback_(callback) +ScreenController::AnimateCallbackImpl::AnimateCallbackImpl(const std::shared_ptr& action, + std::function callback) + : action_(action), callback_(callback) { } diff --git a/state_manager/test/fuzztest/BUILD.gn b/state_manager/test/fuzztest/BUILD.gn index f550c3c..836c737 100644 --- a/state_manager/test/fuzztest/BUILD.gn +++ b/state_manager/test/fuzztest/BUILD.gn @@ -24,7 +24,6 @@ group("fuzztest") { "autoadjustbrightness_fuzzer:AutoAdjustBrightnessFuzzTest", "boostbrightness_fuzzer:BoostBrightnessFuzzTest", "discountbrightness_fuzzer:DiscountBrightnessFuzzTest", - "displaycoverage_fuzzer:DisplayCoverageFuzzTest", "displaystate_fuzzer:DisplayStateFuzzTest", "getbrightness_fuzzer:GetBrightnessFuzzTest", "getdisplayid_fuzzer:GetDisplayIdFuzzTest", diff --git a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn index 561d784..79d1d6b 100644 --- a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn index 87ee959..afe8c18 100644 --- a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn index ac54ba2..1dce674 100644 --- a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn index da49b44..50259e9 100644 --- a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/displaycoverage_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaycoverage_fuzzer/BUILD.gn deleted file mode 100644 index c53f84b..0000000 --- a/state_manager/test/fuzztest/displaycoverage_fuzzer/BUILD.gn +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (c) 2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") -import("../../../../displaymgr.gni") - -module_output_path = "display_manager/display_state_manager" - -##############################fuzztest########################################## -ohos_fuzztest("DisplayCoverageFuzzTest") { - module_out_path = module_output_path - fuzz_config_file = - "${displaymgr_root_path}/test/fuzztest/displaycoverage_fuzzer" - - include_dirs = [ - "./", - "${displaymgr_root_path}/service/native/include", - "${displaymgr_root_path}/service/zidl/include", - "${displaymgr_inner_api}/native/include", - "../display_utils", - ] - - configs = [ - "${displaymgr_utils_path}:utils_config", - "${displaymgr_utils_path}:coverage_flags", - "${brightnessmgr_root_path}:brightness_manager_config", - ] - - deps = [ "${brightnessmgr_root_path}:brightness_manager" ] - - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "${displaymgr_root_path}/service/native/src/display_auto_brightness.cpp", - "${displaymgr_root_path}/service/native/src/display_common_event_mgr.cpp", - "${displaymgr_root_path}/service/native/src/display_param_helper.cpp", - "${displaymgr_root_path}/service/native/src/display_power_mgr_service.cpp", - "${displaymgr_root_path}/service/native/src/display_setting_helper.cpp", - "${displaymgr_root_path}/service/native/src/display_system_ability.cpp", - "${displaymgr_root_path}/service/native/src/gradual_animator.cpp", - "${displaymgr_root_path}/service/native/src/screen_action.cpp", - "${displaymgr_root_path}/service/native/src/screen_controller.cpp", - "${displaymgr_root_path}/service/zidl/src/display_power_callback_proxy.cpp", - "${displaymgr_root_path}/service/zidl/src/display_power_mgr_stub.cpp", - "../display_utils/display_fuzzer.cpp", - "./displaycoverage_fuzzer_test.cpp", - ] - - external_deps = [ "power_manager:power_permission" ] - external_deps += [ - "ability_base:base", - "ability_base:want", - "ability_runtime:ability_manager", - "c_utils:utils", - "common_event_service:cesfwk_innerkits", - "data_share:datashare_common", - "data_share:datashare_consumer", - "display_manager:displaymgr", - "eventhandler:libeventhandler", - "ffrt:libffrt", - "hicollie:libhicollie", - "hilog:libhilog", - "image_framework:image_native", - "ipc:ipc_core", - "power_manager:power_ffrt", - "power_manager:power_setting", - "power_manager:power_sysparam", - "power_manager:powermgr_client", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "window_manager:libdm_lite", - ] - - defines = [] - if (has_sensors_sensor_part) { - external_deps += [ "sensor:sensor_interface_native" ] - defines += [ "ENABLE_SENSOR_PART" ] - } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } - if (use_clang_coverage) { - defines += [ "FUZZ_COV_TEST" ] - } -} diff --git a/state_manager/test/fuzztest/displaycoverage_fuzzer/corpus/init b/state_manager/test/fuzztest/displaycoverage_fuzzer/corpus/init deleted file mode 100644 index e4ceac1..0000000 --- a/state_manager/test/fuzztest/displaycoverage_fuzzer/corpus/init +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FUZZ \ No newline at end of file diff --git a/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.cpp b/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.cpp deleted file mode 100644 index a00ae70..0000000 --- a/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* This files contains faultlog fuzzer test modules. */ - -#define FUZZ_PROJECT_NAME "displaycoverage_fuzzer" - -#include "display_power_mgr_service.h" -#include "displaycoverage_fuzzer_test.h" - -using namespace OHOS::PowerMgr; -using namespace OHOS::DisplayPowerMgr; - -namespace { -const uint32_t DISPLAY_ID = 0; -const uint32_t BRIGHTNESS_MAX = 300; -const uint32_t BRIGHTNESS_MIN = 0; -const double DISCOUNT_MAX = 1.05; -const double DISCOUNT_MIN = 0.01; -const uint32_t brightness = 1; -} //namespace - - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) -{ - OHOS::sptr service = - DelayedSpSingleton::GetInstance(); - service->Init(); - DisplayState state = DisplayState::DISPLAY_OFF; - uint32_t reason = 1; - service->NotifyStateChangeCallback(DISPLAY_ID, state, reason); - service->HandleBootBrightness(); - service->SetScreenOnBrightness(); - service->GetSafeBrightness(BRIGHTNESS_MAX); - service->GetSafeBrightness(BRIGHTNESS_MIN); - service->GetSafeDiscount(DISCOUNT_MAX, brightness); - service->GetSafeDiscount(DISCOUNT_MIN, brightness); - return 0; -} diff --git a/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.h b/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.h deleted file mode 100644 index df33f3c..0000000 --- a/state_manager/test/fuzztest/displaycoverage_fuzzer/displaycoverage_fuzzer_test.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#ifndef DISPLAY_COVERAGE_FUZZER_TEST_H -#define DISPLAY_COVERAGE_FUZZER_TEST_H - -#endif \ No newline at end of file diff --git a/state_manager/test/fuzztest/displaycoverage_fuzzer/project.xml b/state_manager/test/fuzztest/displaycoverage_fuzzer/project.xml deleted file mode 100644 index 2d2bab9..0000000 --- a/state_manager/test/fuzztest/displaycoverage_fuzzer/project.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - 1000 - - 180 - - 4096 - - diff --git a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn index d5fd071..00f67e6 100644 --- a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn @@ -73,6 +73,7 @@ ohos_fuzztest("DisplayStateFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -89,9 +90,6 @@ ohos_fuzztest("DisplayStateFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn index c2c3bab..af3e7e2 100644 --- a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("GetBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn index b189fb1..6f2179d 100644 --- a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn @@ -73,6 +73,7 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -89,9 +90,6 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn index b0bd5e2..2c8f95a 100644 --- a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn index 787a704..b0ac019 100644 --- a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn index 6095b5f..fe2d879 100644 --- a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn index 0bbcd31..649bb73 100644 --- a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("SetBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn index c057800..d31a823 100644 --- a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn index e9801ca..ecc20d8 100644 --- a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn index e14681c..a813644 100644 --- a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", + "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -90,9 +91,6 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] } - if (has_hiviewdfx_hisysevent_part) { - external_deps += [ "hisysevent:libhisysevent" ] - } if (use_clang_coverage) { defines += [ "FUZZ_COV_TEST" ] } diff --git a/state_manager/test/unittest/BUILD.gn b/state_manager/test/unittest/BUILD.gn index d9f1af7..aa2f28f 100644 --- a/state_manager/test/unittest/BUILD.gn +++ b/state_manager/test/unittest/BUILD.gn @@ -36,7 +36,6 @@ deps_ex = [ "ability_runtime:ability_manager", "c_utils:utils", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "power_manager:powermgr_client", "power_manager:power_setting", diff --git a/state_manager/test/unittest/src/display_power_mgr_brightness_test.cpp b/state_manager/test/unittest/src/display_power_mgr_brightness_test.cpp index e546aac..7073d7d 100644 --- a/state_manager/test/unittest/src/display_power_mgr_brightness_test.cpp +++ b/state_manager/test/unittest/src/display_power_mgr_brightness_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -71,7 +71,7 @@ namespace { */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetBrightness001: fun is start"); const uint32_t SET_BRIGHTNESS = 90; bool ret = DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); EXPECT_TRUE(ret); @@ -79,7 +79,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetBrightness001, TestSiz usleep(sleepTime); uint32_t deviceBrightness = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(deviceBrightness, SET_BRIGHTNESS); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetBrightness001: fun is end"); } /** @@ -89,7 +89,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetBrightness001, TestSiz */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSettingBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSettingBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSettingBrightness001: fun is start"); const uint32_t SET_BRIGHTNESS_VALUE = 223; bool ret = DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS_VALUE); EXPECT_TRUE(ret); @@ -97,7 +97,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSettingBrightness001, Tes usleep(sleepTime); // sleep 100ms, wait for setting update uint32_t brightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(brightness, SET_BRIGHTNESS_VALUE); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSettingBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSettingBrightness001: fun is end"); } /** @@ -108,7 +108,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSettingBrightness001, Tes */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessNormal, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessNormal: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessNormal: fun is start"); const uint32_t SET_BRIGHTNESS = 91; const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -119,7 +119,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessNormal, uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(SET_BRIGHTNESS * DISCOUNT_NORMAL)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessNormal: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessNormal: fun is end"); } /** @@ -130,12 +130,12 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessNormal, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessScreenOff, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessScreenOff: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessScreenOff: fun is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); const double DISCOUNT_VALUE = 0.7; bool ret = DisplayPowerMgrClient::GetInstance().DiscountBrightness(DISCOUNT_VALUE); EXPECT_FALSE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessScreenOff: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessScreenOff: fun is end"); } /** @@ -146,7 +146,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessScreenO */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundary001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary001: fun is start"); const uint32_t SET_BRIGHTNESS = 92; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); @@ -157,7 +157,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundar uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); uint32_t minBrightness = DisplayPowerMgrClient::GetInstance().GetMinBrightness(); EXPECT_EQ(value, minBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary001: fun is end"); } /** @@ -168,7 +168,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundar */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundary002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary002: fun is start"); const uint32_t SET_BRIGHTNESS = 93; const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -179,7 +179,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundar uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(SET_BRIGHTNESS * DISCOUNT_UPPER_BOUNDARY)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessBoundary002: fun is end"); } /** @@ -190,7 +190,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessBoundar */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnormal001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal001: fun is start"); const uint32_t SET_BRIGHTNESS = 94; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); @@ -201,7 +201,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); uint32_t minBrightness = DisplayPowerMgrClient::GetInstance().GetMinBrightness(); EXPECT_EQ(value, minBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal001: fun is end"); } /** @@ -212,7 +212,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnormal002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal002: fun is start"); const uint32_t SET_BRIGHTNESS = 95; const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -224,7 +224,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); const double DISCOUNT_MAX_VALUE = 1.0; EXPECT_EQ(value, static_cast(SET_BRIGHTNESS * DISCOUNT_MAX_VALUE)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal002: fun is end"); } /** @@ -235,7 +235,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnormal003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal003: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal003: fun is start"); const uint32_t SET_BRIGHTNESS = 96; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); @@ -246,7 +246,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); uint32_t minBrightness = DisplayPowerMgrClient::GetInstance().GetMinBrightness(); EXPECT_EQ(value, minBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal003: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightnessAbnormal003: fun is end"); } /** @@ -257,7 +257,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightnessAbnorma */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness001: fun is start"); const uint32_t SET_BRIGHTNESS = 97; const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -279,7 +279,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness001, Te usleep(DEFAULT_WAITING_TIME); value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(DISCOUNT_VALUE * SET_BRIGHTNESS)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness001: fun is end"); } /** @@ -290,7 +290,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness001, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness002: fun is start"); const uint32_t SET_BRIGHTNESS = 150; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -310,7 +310,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness002, Te value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(DISCOUNT_VALUE * SET_BRIGHTNESS)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness002: fun is end"); } /** @@ -321,7 +321,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness002, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness003: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness003: fun is start"); const uint32_t SET_BRIGHTNESS = 99; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -341,7 +341,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness003, Te value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(DISCOUNT_VALUE * SET_BRIGHTNESS)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness003: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness003: fun is end"); } /** @@ -352,7 +352,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness003, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness004, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness004: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness004: fun is start"); const uint32_t SET_BRIGHTNESS = 100; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -371,7 +371,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness004, Te value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, static_cast(DISCOUNT_VALUE * SET_BRIGHTNESS)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness004: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness004: fun is end"); } /** @@ -382,7 +382,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness004, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness005, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness005: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness005: fun is start"); const uint32_t SET_BRIGHTNESS = 103; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); @@ -393,7 +393,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness005, Te usleep(sleepTime); // sleep 100ms, wait for setting update uint32_t beforeBrightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(SET_BRIGHTNESS, beforeBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDiscountBrightness005: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDiscountBrightness005: fun is end"); } /** @@ -403,14 +403,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDiscountBrightness005, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness001: fun is start"); const uint32_t OVERRIDE_BRIGHTNESS = 255; bool ret = DisplayPowerMgrClient::GetInstance().OverrideBrightness(OVERRIDE_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); EXPECT_TRUE(ret); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, OVERRIDE_BRIGHTNESS); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness001: fun is end"); } /** @@ -420,7 +420,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness001, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness002: fun is start"); const uint32_t SET_BRIGHTNESS = 104; const uint32_t OVERRIDE_BRIGHTNESS = 255; const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -437,7 +437,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness002, Te EXPECT_TRUE(ret); value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, SET_BRIGHTNESS); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness002: fun is end"); } /** @@ -447,7 +447,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness002, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness003: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness003: fun is start"); const uint32_t SET_BRIGHTNESS = 105; const uint32_t OVERRIDE_BRIGHTNESS = 255; bool ret = DisplayPowerMgrClient::GetInstance().OverrideBrightness(OVERRIDE_BRIGHTNESS); @@ -458,7 +458,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness003, Te EXPECT_FALSE(ret); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, OVERRIDE_BRIGHTNESS); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness003: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness003: fun is end"); } /** @@ -468,7 +468,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness003, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness004, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness004: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness004: fun is start"); const uint32_t SET_BRIGHTNESS = 106; bool ret = DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); usleep(DEFAULT_WAITING_TIME); @@ -477,7 +477,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness004, Te EXPECT_FALSE(ret); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, SET_BRIGHTNESS); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness004: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness004: fun is end"); } /** @@ -487,14 +487,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness004, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness005, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness005: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness005: fun is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); const uint32_t OVERRIDE_BRIGHTNESS = 100; bool isBoost = DisplayPowerMgrClient::GetInstance().OverrideBrightness(OVERRIDE_BRIGHTNESS); EXPECT_FALSE(isBoost); bool isRestore = DisplayPowerMgrClient::GetInstance().RestoreBrightness(); EXPECT_FALSE(isRestore); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness005: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness005: fun is end"); } /** @@ -505,14 +505,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness005, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness006, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness006: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness006: fun is start"); uint32_t overrideValue = 256; uint32_t brightnessMax = 255; DisplayPowerMgrClient::GetInstance().OverrideBrightness(overrideValue); usleep(DEFAULT_WAITING_TIME); uint32_t deviceBrightness = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(brightnessMax, deviceBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness006: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness006: fun is end"); } /** @@ -523,14 +523,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness006, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness007, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness007: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness007: fun is start"); uint32_t overrideValue = 0; uint32_t brightnessMin = DisplayPowerMgrClient::GetInstance().GetMinBrightness(); EXPECT_TRUE(DisplayPowerMgrClient::GetInstance().OverrideBrightness(overrideValue)); usleep(DEFAULT_WAITING_TIME); uint32_t deviceBrightness = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(brightnessMin, deviceBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness007: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness007: fun is end"); } /** @@ -541,14 +541,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness007, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness008, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness008: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness008: fun is start"); uint32_t overrideValue = -1; uint32_t brightnessMax = 255; EXPECT_TRUE(DisplayPowerMgrClient::GetInstance().OverrideBrightness(overrideValue)); usleep(DEFAULT_WAITING_TIME); uint32_t deviceBrightness = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(brightnessMax, deviceBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness008: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness008: fun is end"); } /** @@ -560,7 +560,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness008, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness009, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness009: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness009: fun is start"); const uint32_t OVERRIDE_BRIGHTNESS = 156; const uint32_t SET_BRIGHTNESS = 66; auto currentBrightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); @@ -576,7 +576,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness009, Te usleep(DEFAULT_WAITING_TIME); uint32_t deviceBrightness = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(currentBrightness, deviceBrightness); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrOverrideBrightness009: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrOverrideBrightness009: fun is end"); } /** @@ -586,7 +586,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrOverrideBrightness009, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMaxBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrMaxBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrMaxBrightness001: fun is start"); uint32_t max = DisplayPowerMgrClient::GetInstance().GetMaxBrightness(); EXPECT_LE(max, 255); bool ret = DisplayPowerMgrClient::GetInstance().SetBrightness(max + 100); @@ -594,7 +594,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMaxBrightness001, TestSiz EXPECT_TRUE(ret); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, max); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrMaxBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrMaxBrightness001: fun is end"); } /** @@ -604,7 +604,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMaxBrightness001, TestSiz */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMinBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrMinBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrMinBrightness001: fun is start"); const uint32_t SET_BRIGHTNESS_VALUE = 0; uint32_t min = DisplayPowerMgrClient::GetInstance().GetMinBrightness(); EXPECT_GE(min, 0); @@ -613,7 +613,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMinBrightness001, TestSiz EXPECT_TRUE(ret); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(value, min); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrMinBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrMinBrightness001: fun is end"); } /** @@ -623,11 +623,11 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrMinBrightness001, TestSiz */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDefaultBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDefaultBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDefaultBrightness001: fun is start"); uint32_t value = DisplayPowerMgrClient::GetInstance().GetDefaultBrightness(); EXPECT_GE(value, 0); EXPECT_LE(value, 255); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrDefaultBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrDefaultBrightness001: fun is end"); } /** @@ -637,11 +637,11 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrDefaultBrightness001, Tes */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessNormal, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNormal: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNormal: fun is start"); const uint32_t BOOST_TIME = 100; // keep BoostBrightness 100ms bool isSucc = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_TIME); EXPECT_TRUE(isSucc); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNormal: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNormal: fun is end"); } /** @@ -651,11 +651,11 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessNormal, Te */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessAbnormal, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessAbnormal: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessAbnormal: fun is start"); const uint32_t BOOST_TIME = -1; bool isSucc = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_TIME); EXPECT_FALSE(isSucc); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessAbnormal: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessAbnormal: fun is end"); } /** @@ -665,13 +665,13 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessAbnormal, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrCancelBoostBrightnessNormal, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrCancelBoostBrightnessNormal: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrCancelBoostBrightnessNormal: fun is start"); const uint32_t BOOST_TIME = 50000; bool isSucc = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_TIME); EXPECT_TRUE(isSucc); bool isCancel = DisplayPowerMgrClient::GetInstance().CancelBoostBrightness(); EXPECT_TRUE(isCancel); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrCancelBoostBrightnessNormal: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrCancelBoostBrightnessNormal: fun is end"); } /** @@ -681,7 +681,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrCancelBoostBrightnessNorm */ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive1, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BoostAndOverrideMutuallyExclusive: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BoostAndOverrideMutuallyExclusive: fun is start"); const uint32_t BOOST_TIME = 50000; const uint32_t OVERRIDE_BIRGHTNESS = 100; bool isBoost = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_TIME); @@ -690,7 +690,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive1, Test EXPECT_FALSE(isOverride); bool isRestore = DisplayPowerMgrClient::GetInstance().RestoreBrightness(); EXPECT_FALSE(isRestore); - DISPLAY_HILOGD(LABEL_TEST, "BoostAndOverrideMutuallyExclusive: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BoostAndOverrideMutuallyExclusive: fun is end"); } /** @@ -700,7 +700,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive1, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive2, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "BoostAndOverrideMutuallyExclusive2: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "BoostAndOverrideMutuallyExclusive2: fun is start"); const uint32_t BOOST_TIME = 50000; const uint32_t OVERRIDE_BIRGHTNESS = 255; bool isOverride = DisplayPowerMgrClient::GetInstance().OverrideBrightness(OVERRIDE_BIRGHTNESS); @@ -709,7 +709,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive2, Test EXPECT_FALSE(isBoost); bool isCancel = DisplayPowerMgrClient::GetInstance().CancelBoostBrightness(); EXPECT_FALSE(isCancel); - DISPLAY_HILOGD(LABEL_TEST, "BoostAndOverrideMutuallyExclusive2: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "BoostAndOverrideMutuallyExclusive2: fun is end"); } /** @@ -719,7 +719,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, BoostAndOverrideMutuallyExclusive2, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout1, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout1: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout1: fun is start"); uint32_t beforeValue = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); const uint32_t BOOST_BRIGHTNESS_TIME = 100; bool isBoost = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_BRIGHTNESS_TIME); @@ -728,7 +728,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout1, usleep(sleepTime); // sleep 200ms, wait for setting update uint32_t currentValue = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(beforeValue, currentValue); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout1: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout1: fun is end"); } /** @@ -738,7 +738,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout1, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout2, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout2: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout2: fun is start"); const uint32_t SET_BRIGHTNESS = 106; const uint32_t BOOST_BRIGHTNESS_TIME = 100; const int sleepTime = (BOOST_BRIGHTNESS_TIME + 50) * 1000; // wait for (100 + 50)ms BoostBrightness timeout @@ -750,7 +750,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout2, EXPECT_TRUE(isSet); uint32_t currentValue = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(SET_BRIGHTNESS, currentValue); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout2: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessTimeout2: fun is end"); } /** @@ -760,7 +760,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessTimeout2, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel1, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel1: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel1: fun is start"); const uint32_t SET_BRIGHTNESS = 106; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SET_SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -774,9 +774,9 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel1, T usleep(SLEEP_TIME); // sleep 100ms, wait for cancel BoostBrightness uint32_t currentValue = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(SET_BRIGHTNESS, currentValue) << "beforeValue: " << SET_BRIGHTNESS << " currentVal: " << currentValue; - DISPLAY_HILOGD(LABEL_TEST, "BoostBrightnessCancel1: beforeValue: %{public}d, currentVal: %{public}d", + DISPLAY_HILOGI(LABEL_TEST, "BoostBrightnessCancel1: beforeValue: %{public}d, currentVal: %{public}d", SET_BRIGHTNESS, currentValue); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel1: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel1: fun is end"); } /** @@ -786,7 +786,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel1, T */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel2, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel2: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel2: fun is start"); const uint32_t BOOST_BRIGHTNESS_TIME = 10000; bool isBoost = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_BRIGHTNESS_TIME); EXPECT_TRUE(isBoost); @@ -798,7 +798,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel2, T EXPECT_TRUE(isSet); uint32_t currentValue = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(SET_BRIGHTNESS_VALUE, currentValue); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel2: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessCancel2: fun is end"); } /** @@ -808,7 +808,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessCancel2, T */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessNotAdjust, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNotAdjust: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNotAdjust: fun is start"); const uint32_t SET_BRIGHTNESS = 107; const uint32_t BOOST_BRIGHTNESS_TIME = 10000; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -821,7 +821,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessNotAdjust, DisplayPowerMgrClient::GetInstance().CancelBoostBrightness(); uint32_t currentValue = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(SET_BRIGHTNESS, currentValue); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNotAdjust: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessNotAdjust: fun is end"); } /** @@ -831,14 +831,14 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessNotAdjust, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessScreenOff, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessScreenOff: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessScreenOff: fun is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); const uint32_t BOOST_BRIGHTNESS_TIME = 10000; bool isBoost = DisplayPowerMgrClient::GetInstance().BoostBrightness(BOOST_BRIGHTNESS_TIME); EXPECT_FALSE(isBoost); bool isCancel = DisplayPowerMgrClient::GetInstance().CancelBoostBrightness(); EXPECT_FALSE(isCancel); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessScreenOff: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessScreenOff: fun is end"); } /** @@ -848,7 +848,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessScreenOff, */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessMultipleCalls, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessMultipleCalls: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessMultipleCalls: fun is start"); const uint32_t SET_BRIGHTNESS = 108; const uint32_t COUNT = 3; const uint32_t TIMEOUT = 100; @@ -872,7 +872,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessMultipleCa EXPECT_TRUE(isSet); uint32_t currentVal = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(SET_BRIGHTNESS_VALUE, currentVal); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrBoostBrightnessMultipleCalls: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrBoostBrightnessMultipleCalls: fun is end"); } /** @@ -882,12 +882,12 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrBoostBrightnessMultipleCa */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness001: fun is start"); bool ret = DisplayPowerMgrClient::GetInstance().AdjustBrightness(0, 3000); EXPECT_TRUE(ret); DisplayPowerMgrClient::GetInstance().AdjustBrightness(0, 5); usleep(10000); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness001: fun is end"); } /** @@ -897,18 +897,18 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness001, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: fun is start"); bool ret = DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(true); //waiting to find correct isSettingEnable value usleep(50000); if (ret) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: is supported"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: is supported"); ret = DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(false); //waiting to find correct isSettingEnable value usleep(50000); EXPECT_TRUE(ret); } else { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: is not supported"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness002: is not supported"); EXPECT_FALSE(ret); } } @@ -921,7 +921,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness002, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness003: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness003: fun is start"); bool ret = DisplayPowerMgrClient::GetInstance().IsAutoAdjustBrightness(); DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(false); //waiting to find correct isSettingEnable value @@ -930,7 +930,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness003, Test DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(ret); //waiting to find correct isSettingEnable value usleep(50000); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrAdjustBrightness003: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrAdjustBrightness003: fun is end"); } /** @@ -941,7 +941,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrAdjustBrightness003, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrScreenBrightnessEquality001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrScreenBrightnessEquality001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrScreenBrightnessEquality001: fun is start"); DisplayPowerMgrClient::GetInstance().AdjustBrightness(0, 5); usleep(10000); uint32_t deviceBrightness1 = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); @@ -955,7 +955,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrScreenBrightnessEquality0 DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); uint32_t deviceBrightness2 = DisplayPowerMgrClient::GetInstance().GetDeviceBrightness(); EXPECT_EQ(deviceBrightness1, deviceBrightness2); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrScreenBrightnessEquality001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrScreenBrightnessEquality001: fun is end"); } /** @@ -966,7 +966,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrScreenBrightnessEquality0 */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSleepBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSleepBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSleepBrightness001: fun is start"); uint32_t deviceBrightness1 = DisplayPowerMgrClient::GetInstance().GetBrightness(); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_DIM); //waiting to find correct isSettingEnable value @@ -974,7 +974,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSleepBrightness001, TestS uint32_t deviceBrightness2 = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(deviceBrightness1, deviceBrightness2); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSleepBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSleepBrightness001: fun is end"); } /** @@ -985,7 +985,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSleepBrightness001, TestS */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThreshold001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold001: fun is start"); std::vector threshold = {200, 200, 20}; uint32_t type = 1; int32_t state = 0; @@ -994,7 +994,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThresho callback->OnNotifyApsLightBrightnessChange(type, state); uint32_t result = DisplayPowerMgrClient::GetInstance().SetLightBrightnessThreshold(threshold, callback); EXPECT_EQ(result, SUCCESS_RESULT); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold001: fun is end"); } /** @@ -1005,7 +1005,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThresho */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThreshold002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold002: fun is start"); std::vector threshold = {}; uint32_t type = 1; int32_t state = 0; @@ -1014,7 +1014,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThresho callback->OnNotifyApsLightBrightnessChange(type, state); uint32_t result = DisplayPowerMgrClient::GetInstance().SetLightBrightnessThreshold(threshold, callback); EXPECT_EQ(result, FAILD_RESULT); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetLightBrightnessThreshold002: fun is end"); } /** @@ -1025,7 +1025,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetLightBrightnessThresho */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit001: fun is start"); const uint32_t SET_BRIGHTNESS = 150; // mapping nit = 350 const uint32_t SET_BRIGHTNESS_NIT = 350; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -1041,7 +1041,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit001, T uint32_t brightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(SET_MAX_BRIGHTNESS, brightness); DisplayPowerMgrClient::GetInstance().SetMaxBrightnessNit(SET_BRIGHTNESS_NIT, 1); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit001: fun is end"); } /** @@ -1051,7 +1051,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit001, T */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit002: fun is start"); const uint32_t SET_BRIGHTNESS = 150; // mapping nit = 350 const uint32_t SET_BRIGHTNESS_NIT = 350; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); @@ -1066,7 +1066,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit002, T uint32_t brightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(SET_BRIGHTNESS, brightness); DisplayPowerMgrClient::GetInstance().SetMaxBrightnessNit(SET_BRIGHTNESS_NIT, 1); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightnessNit002: fun is end"); } /** @@ -1077,7 +1077,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightnessNit002, T */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightness001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness001: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness001: fun is start"); const uint32_t SET_BRIGHTNESS = 150; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -1092,7 +1092,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightness001, Test EXPECT_EQ(SET_MAX_BRIGHTNESS, brightness); DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS, 1); usleep(SLEEP_TIME); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness001: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness001: fun is end"); } /** @@ -1102,7 +1102,7 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightness001, Test */ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightness002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness002: fun is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness002: fun is start"); const uint32_t SET_BRIGHTNESS = 150; DisplayPowerMgrClient::GetInstance().SetBrightness(SET_BRIGHTNESS); const int32_t SLEEP_TIME = DEFAULT_WAITING_TIME; @@ -1116,6 +1116,6 @@ HWTEST_F(DisplayPowerMgrBrightnessTest, DisplayPowerMgrSetMaxBrightness002, Test uint32_t brightness = DisplayPowerMgrClient::GetInstance().GetBrightness(); EXPECT_EQ(SET_BRIGHTNESS, brightness); DisplayPowerMgrClient::GetInstance().SetMaxBrightness(SET_BRIGHTNESS, 1); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness002: fun is end"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrSetMaxBrightness002: fun is end"); } } // namespace \ No newline at end of file diff --git a/state_manager/test/unittest/src/display_power_mgr_service_test.cpp b/state_manager/test/unittest/src/display_power_mgr_service_test.cpp index 803c8bf..82e1da4 100644 --- a/state_manager/test/unittest/src/display_power_mgr_service_test.cpp +++ b/state_manager/test/unittest/src/display_power_mgr_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -44,12 +44,11 @@ namespace { */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService001 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService01 is start"); sptr sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); EXPECT_TRUE(sam != nullptr) << "DisplayPowerMgrService01 fail to get GetSystemAbilityManager"; sptr remoteObject_ = sam->CheckSystemAbility(DISPLAY_MANAGER_SERVICE_ID); EXPECT_TRUE(remoteObject_ != nullptr) << "GetSystemAbility failed."; - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService001 is end"); } /** @@ -59,10 +58,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService001, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService002 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService002 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService002 is end"); } /** @@ -72,10 +70,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService002, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService003 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService003 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService003 is end"); } /** @@ -85,10 +82,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService003, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService004, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService004 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService004 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_DIM); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService004 is end"); } /** @@ -98,10 +94,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService004, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService005, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService005 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService005 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_SUSPEND); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService005 is end"); } /** @@ -111,10 +106,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService005, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService006, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService006 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService006 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_UNKNOWN); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService006 is end"); } /** @@ -124,13 +118,12 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService006, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService007, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService007 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService007 is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); EXPECT_TRUE(ret); DisplayState state = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(state == DisplayState::DISPLAY_ON); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService007 is end"); } /** @@ -140,12 +133,11 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService007, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService008, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService008 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService008 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_DIM); EXPECT_TRUE(ret); DisplayState state = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(state == DisplayState::DISPLAY_DIM); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService008 is end"); } /** @@ -155,12 +147,11 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService008, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService009, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService009 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService009 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); EXPECT_TRUE(ret); DisplayState state = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(state == DisplayState::DISPLAY_OFF); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService009 is end"); } /** @@ -170,12 +161,11 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService009, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService010, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService010 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService010 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_SUSPEND); EXPECT_TRUE(ret); DisplayState state = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(state == DisplayState::DISPLAY_SUSPEND); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService010 is end"); } /** @@ -185,12 +175,11 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService010, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService011, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService011 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService011 is start"); auto ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_UNKNOWN); EXPECT_TRUE(ret); DisplayState state = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(state == DisplayState::DISPLAY_UNKNOWN); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService011 is end"); } /** @@ -200,10 +189,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService011, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService012, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService012 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService012 is start"); std::vector ret = DisplayPowerMgrClient::GetInstance().GetDisplayIds(); EXPECT_TRUE(ret.size() != 0); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService012 is end"); } /** @@ -213,10 +201,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService012, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService013, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService013 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService013 is start"); int32_t ret = DisplayPowerMgrClient::GetInstance().GetMainDisplayId(); EXPECT_TRUE(ret == 0); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService013 is end"); } /** @@ -226,17 +213,16 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService013, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService014, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService014 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService014 is start"); bool ret = DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(true); if (ret) { - DISPLAY_HILOGD(LABEL_TEST, "AutoAdjustBrightness: is supported"); + DISPLAY_HILOGI(LABEL_TEST, "AutoAdjustBrightness: is supported"); ret = DisplayPowerMgrClient::GetInstance().AutoAdjustBrightness(false); EXPECT_TRUE(ret); } else { - DISPLAY_HILOGD(LABEL_TEST, "AutoAdjustBrightness: is not supported"); + DISPLAY_HILOGI(LABEL_TEST, "AutoAdjustBrightness: is not supported"); EXPECT_FALSE(ret); } - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService014 is end"); } /** @@ -246,11 +232,10 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService014, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService015, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService015 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService015 is start"); DisplayErrors error = DisplayPowerMgrClient::GetInstance().GetError(); - DISPLAY_HILOGD(LABEL_TEST, "get error %{public}d", static_cast(error)); + DISPLAY_HILOGI(LABEL_TEST, "get error %{public}d", static_cast(error)); EXPECT_TRUE(error == DisplayErrors::ERR_OK); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService015 is end"); } /** @@ -261,10 +246,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService015, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService016, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService016 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService016 is start"); bool result = DisplayPowerMgrClient::GetInstance().RegisterCallback(nullptr); EXPECT_EQ(result, false); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService016 is end"); } /** @@ -274,10 +258,9 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService016, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService017, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService017 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService017 is start"); bool ret = DisplayPowerMgrClient::GetInstance().OverrideDisplayOffDelay(0); EXPECT_FALSE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService017 is end"); } /** @@ -287,7 +270,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService017, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService018, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService018 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService018 is start"); DisplayState State = DisplayPowerMgrClient::GetInstance().GetDisplayState(); if (State != DisplayState::DISPLAY_OFF) { DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); @@ -295,7 +278,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService018, TestSize.Level0) uint32_t delayTime = 10; //delay time is 10ms bool ret = DisplayPowerMgrClient::GetInstance().OverrideDisplayOffDelay(delayTime); EXPECT_FALSE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService018 is end"); } /** @@ -305,7 +287,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService018, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService019, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService019 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService019 is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); uint32_t delayTime = 10; //delay time is 10ms DisplayPowerMgrClient::GetInstance().OverrideDisplayOffDelay(delayTime); @@ -317,7 +299,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService019, TestSize.Level0) sleep(sleepTime); DisplayState offState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(offState == DisplayState::DISPLAY_OFF); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService019 is end"); } /** @@ -327,7 +308,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService019, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService020, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService020 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService020 is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); uint32_t delayTime = 200; //delay time is 200ms DisplayPowerMgrClient::GetInstance().OverrideDisplayOffDelay(delayTime); @@ -339,7 +320,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService020, TestSize.Level0) usleep(sleepTime); DisplayState onState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(onState == DisplayState::DISPLAY_ON); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService020 is end"); } /** @@ -350,7 +330,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService020, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService021, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService021 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService021 is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); int sleepTime = 2; //Callback for waiting window 2s @@ -369,7 +349,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService021, TestSize.Level0) ret = DisplayPowerMgrClient::GetInstance().SetDisplayState( DisplayState::DISPLAY_OFF, PowerMgr::StateChangeReason::STATE_CHANGE_REASON_APPLICATION); EXPECT_TRUE(ret); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService021 is end"); } /** @@ -380,7 +359,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService021, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService022, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService022 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService022 is start"); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_ON); DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); int sleepTime = 2; @@ -394,7 +373,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService022, TestSize.Level0) EXPECT_FALSE(ret); currentState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(currentState == DisplayState::DISPLAY_OFF); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService022 is end"); } /** @@ -405,7 +383,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService022, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService023, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService023 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService023 is start"); bool ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); int sleepTime = 2; //Callback for waiting window 2s @@ -418,7 +396,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService023, TestSize.Level0) EXPECT_TRUE(ret); currentState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(currentState == DisplayState::DISPLAY_ON); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService023 is end"); } /** @@ -429,7 +406,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService023, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService024, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService024 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService024 is start"); bool ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); int sleepTime = 2; //Callback for waiting window 2s @@ -442,7 +419,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService024, TestSize.Level0) EXPECT_TRUE(ret); currentState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(currentState == DisplayState::DISPLAY_ON); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService024 is end"); } /** @@ -453,7 +429,7 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService024, TestSize.Level0) */ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService025, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService025 is start"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrService025 is start"); bool ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(DisplayState::DISPLAY_OFF); int sleepTime = 2; //Callback for waiting window 2s @@ -467,7 +443,6 @@ HWTEST_F(DisplayPowerMgrServiceTest, DisplayPowerMgrService025, TestSize.Level0) EXPECT_FALSE(ret); currentState = DisplayPowerMgrClient::GetInstance().GetDisplayState(); EXPECT_TRUE(currentState == DisplayState::DISPLAY_OFF); - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrService025 is end"); } } // namespace diff --git a/state_manager/test/unittest/src/display_service_death_test.cpp b/state_manager/test/unittest/src/display_service_death_test.cpp index 84cc071..f3b37c5 100644 --- a/state_manager/test/unittest/src/display_service_death_test.cpp +++ b/state_manager/test/unittest/src/display_service_death_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/state_manager/test/unittest/src/mock/display_mock_object_test.cpp b/state_manager/test/unittest/src/mock/display_mock_object_test.cpp index 39d7e1f..cfaa75e 100644 --- a/state_manager/test/unittest/src/mock/display_mock_object_test.cpp +++ b/state_manager/test/unittest/src/mock/display_mock_object_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -42,7 +42,7 @@ static constexpr double DISCOUNT_VALUE = 0.30; void DisplayMockObjectTest::DisplayPowerMgrTestCallback::OnDisplayStateChanged( uint32_t displayId, DisplayPowerMgr::DisplayState state, uint32_t reason) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrTestCallback::OnDisplayStateChangedStub"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrTestCallback::OnDisplayStateChangedStub"); } namespace { diff --git a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp index 4c5ece2..757d141 100644 --- a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp +++ b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,16 +19,12 @@ #include "display_power_mgr_client.h" #include "ipc_object_stub.h" #include "power_state_machine_info.h" -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include -#endif #include #include using namespace testing::ext; -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART using namespace OHOS::HiviewDFX; -#endif using namespace OHOS::PowerMgr; using namespace OHOS::DisplayPowerMgr; using namespace OHOS; @@ -79,7 +75,7 @@ void DisplayMockParcelTest::DisplayProxyTestFunc(std::shared_ptr result; result.push_back(DISPLAY_ID); @@ -114,7 +109,6 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_001, TestSize.Level0) EXPECT_FALSE(client.BoostBrightness(TIMEOUT_MS, DISPLAY_ID)); EXPECT_FALSE(client.CancelBoostBrightness(DISPLAY_ID)); EXPECT_EQ(BRIGHTNESS_NONE_VALUE, client.GetDeviceBrightness(DISPLAY_ID)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_001: fun is end"); } /** @@ -125,7 +119,6 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_001, TestSize.Level0) */ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_002: fun is start"); auto sptrDisplayProxy = std::make_shared(nullptr); sptr callbackPtr = nullptr; @@ -133,7 +126,6 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_002, TestSize.Level0) EXPECT_EQ(BRIGHTNESS_NONE_VALUE, sptrDisplayProxy->GetDeviceBrightness(DISPLAY_ID)); EXPECT_FALSE(sptrDisplayProxy->RegisterCallback(callbackPtr)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_002: fun is end"); } /** @@ -144,12 +136,10 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_002, TestSize.Level0) */ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_003: fun is start"); auto sptrDisplayProxy = std::make_shared(nullptr); sptr callbackPtr = new DisplayMockParcelTest::DisplayPowerMgrTestCallback(); EXPECT_FALSE(sptrDisplayProxy->RegisterCallback(callbackPtr)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_003: fun is end"); } /** @@ -160,7 +150,6 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_003, TestSize.Level0) */ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_004, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_004: fun is start"); sptr sptrRemoteObj = new IPCObjectStub(); auto sptrDisplayProxy = std::make_shared(sptrRemoteObj); @@ -170,7 +159,6 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_004, TestSize.Level0) EXPECT_EQ(BRIGHTNESS_NONE_VALUE, sptrDisplayProxy->GetDeviceBrightness(DISPLAY_ID)); EXPECT_FALSE(sptrDisplayProxy->RegisterCallback(callbackPtr)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_004: fun is end"); } /** @@ -181,12 +169,10 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_004, TestSize.Level0) */ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_005, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_005: fun is start"); sptr callbackPtr = new DisplayMockParcelTest::DisplayPowerMgrTestCallback(); MessageParcel data; MessageParcel reply; MessageOption option; EXPECT_NE(ERR_OK, callbackPtr->OnRemoteRequest(CODE_VALUE, data, reply, option)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockParcelTest_005: fun is end"); } } // namespace diff --git a/state_manager/test/unittest/src/mock/display_mock_test.cpp b/state_manager/test/unittest/src/mock/display_mock_test.cpp index f981c72..624608e 100644 --- a/state_manager/test/unittest/src/mock/display_mock_test.cpp +++ b/state_manager/test/unittest/src/mock/display_mock_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,14 +22,10 @@ #include "ipc_object_stub.h" #include "mock_display_remote_object.h" #include "power_state_machine_info.h" -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include -#endif using namespace testing::ext; -#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART using namespace OHOS::HiviewDFX; -#endif using namespace OHOS::PowerMgr; using namespace OHOS::DisplayPowerMgr; using namespace OHOS; @@ -52,7 +48,7 @@ static constexpr double DISCOUNT_VALUE = 0.30; void DisplayMockTest::DisplayPowerMgrTestCallback::OnDisplayStateChanged( uint32_t displayId, DisplayPowerMgr::DisplayState state, uint32_t reason) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayPowerMgrTestCallback::OnDisplayStateChangedStub"); + DISPLAY_HILOGI(LABEL_TEST, "DisplayPowerMgrTestCallback::OnDisplayStateChangedStub"); } namespace { @@ -64,13 +60,11 @@ namespace { */ HWTEST_F(DisplayMockTest, DisplayMockTest_001, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_001: fun is start"); sptr callbackPtr = new DisplayMockTest::DisplayPowerMgrTestCallback(); MessageParcel data; MessageParcel reply; MessageOption option; EXPECT_NE(ERR_OK, callbackPtr->OnRemoteRequest(CODE_VALUE, data, reply, option)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_001: fun is end"); } /** @@ -81,14 +75,12 @@ HWTEST_F(DisplayMockTest, DisplayMockTest_001, TestSize.Level0) */ HWTEST_F(DisplayMockTest, DisplayMockTest_002, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_002: fun is start"); sptr callbackPtr = new DisplayMockTest::DisplayPowerMgrTestCallback(); MessageParcel data; MessageParcel reply; MessageOption option; uint32_t code = static_cast(PowerMgr::DisplayPowerCallbackInterfaceCode::ON_DISPLAY_STATE_CHANGED); EXPECT_NE(ERR_OK, callbackPtr->OnRemoteRequest(code, data, reply, option)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_002: fun is end"); } /** @@ -99,7 +91,6 @@ HWTEST_F(DisplayMockTest, DisplayMockTest_002, TestSize.Level0) */ HWTEST_F(DisplayMockTest, DisplayMockTest_003, TestSize.Level0) { - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_003: fun is start"); sptr sptrRemoteObj = new MockDisplayRemoteObject(); auto sptrDisplayProxy = std::make_shared(sptrRemoteObj); EXPECT_FALSE(sptrDisplayProxy->SetDisplayState(DISPLAY_ID, DisplayPowerMgr::DisplayState::DISPLAY_ON, REASON)); @@ -123,6 +114,5 @@ HWTEST_F(DisplayMockTest, DisplayMockTest_003, TestSize.Level0) EXPECT_FALSE(sptrDisplayProxy->IsAutoAdjustBrightness()); EXPECT_FALSE(sptrDisplayProxy->BoostBrightness(TIMEOUT_MS, DISPLAY_ID)); EXPECT_FALSE(sptrDisplayProxy->CancelBoostBrightness(DISPLAY_ID)); - DISPLAY_HILOGD(LABEL_TEST, "DisplayMockTest_003: fun is end"); } } // namespace -- Gitee