From 3bacdc19a824780629a2ea5c5b286efe2d91bffb Mon Sep 17 00:00:00 2001 From: cjw123qq Date: Thu, 3 Jul 2025 22:32:48 +0800 Subject: [PATCH] fix: add coverage code for display taihe Signed-off-by: cjw123qq --- bundle.json | 5 +- displaymgr.gni | 2 + state_manager/frameworks/ets/taihe/BUILD.gn | 11 +- .../BUILD.gn | 17 ++- .../idl/ohos.brightness.taihe | 0 .../src/ani_constructor.cpp | 0 .../src/ohos.brightness.impl.cpp | 3 + .../test/test_main.ets | 0 .../taihe/brightness/test/unittest/BUILD.gn | 56 +++++++++ .../brightness_ani_constructor_test.cpp | 113 ++++++++++++++++++ .../unittest/brightness_taihe_native_test.cpp | 109 +++++++++++++++++ .../test/xts/Brightness.test.ets | 0 .../test/xts/List.test.ets | 0 .../test/xts/Util.test.ets | 0 14 files changed, 301 insertions(+), 15 deletions(-) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/BUILD.gn (84%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/idl/ohos.brightness.taihe (100%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/src/ani_constructor.cpp (100%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/src/ohos.brightness.impl.cpp (96%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/test/test_main.ets (100%) create mode 100644 state_manager/frameworks/ets/taihe/brightness/test/unittest/BUILD.gn create mode 100644 state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_ani_constructor_test.cpp create mode 100644 state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_taihe_native_test.cpp rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/test/xts/Brightness.test.ets (100%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/test/xts/List.test.ets (100%) rename state_manager/frameworks/ets/taihe/{ability_delegator => brightness}/test/xts/Util.test.ets (100%) diff --git a/bundle.json b/bundle.json index 5f5a6f3..3837dcb 100644 --- a/bundle.json +++ b/bundle.json @@ -74,14 +74,15 @@ "name": "//base/powermgr/display_manager/state_manager/interfaces/inner_api:displaymgr" }, { - "name": "//base/powermgr/display_manager/state_manager/frameworks/ets/taihe/ability_delegator:copy_display_manager" + "name": "//base/powermgr/display_manager/state_manager/frameworks/ets/taihe/brightness:copy_display_manager" } ], "test": [ "//base/powermgr/display_manager/state_manager/test:displaymgr_coverage_test", "//base/powermgr/display_manager/state_manager/test:displaymgr_native_test", "//base/powermgr/display_manager/state_manager/test:fuzztest", - "//base/powermgr/display_manager/brightness_manager/test:brightness_manager_test" + "//base/powermgr/display_manager/brightness_manager/test:brightness_manager_test", + "//base/powermgr/display_manager/state_manager/frameworks/ets/taihe:display_manager_taihe_test" ] } } diff --git a/displaymgr.gni b/displaymgr.gni index 5e947aa..4919c31 100644 --- a/displaymgr.gni +++ b/displaymgr.gni @@ -54,3 +54,5 @@ displaymgr_inner_api = "${displaymgr_root_path}/interfaces/inner_api" displaymgr_utils_path = "${displaymgr_root_path}/utils" brightnessmgr_root_path = "//base/powermgr/display_manager/brightness_manager" + +taihe_generated_file_path = "${root_out_dir}/taihe/out/powermgr/display_manager" \ No newline at end of file diff --git a/state_manager/frameworks/ets/taihe/BUILD.gn b/state_manager/frameworks/ets/taihe/BUILD.gn index 278b84d..774bc20 100644 --- a/state_manager/frameworks/ets/taihe/BUILD.gn +++ b/state_manager/frameworks/ets/taihe/BUILD.gn @@ -13,7 +13,12 @@ group("display_manager_taihe") { deps = [ - "ability_delegator:brightness_etc", - "ability_delegator:display_manager_brightness_taihe_native", + "brightness:brightness_etc", + "brightness:display_manager_brightness_taihe_native", ] -} \ No newline at end of file +} + +group("display_manager_taihe_test") { + testonly = true + deps = [ "brightness/test/unittest:brightness_taihe_native_test" ] +} diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/BUILD.gn b/state_manager/frameworks/ets/taihe/brightness/BUILD.gn similarity index 84% rename from state_manager/frameworks/ets/taihe/ability_delegator/BUILD.gn rename to state_manager/frameworks/ets/taihe/brightness/BUILD.gn index 15a75db..a3c1e9d 100644 --- a/state_manager/frameworks/ets/taihe/ability_delegator/BUILD.gn +++ b/state_manager/frameworks/ets/taihe/brightness/BUILD.gn @@ -20,10 +20,6 @@ copy_taihe_idl("copy_display_manager") { sources = [ "idl/ohos.brightness.taihe" ] } -subsystem_name = "powermgr" -part_name = "display_manager" -taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" - ohos_taihe("run_taihe") { taihe_generated_file_path = "$taihe_generated_file_path" deps = [ ":copy_display_manager" ] @@ -41,8 +37,6 @@ taihe_shared_library("display_manager_brightness_taihe_native") { debug = false } taihe_generated_file_path = "$taihe_generated_file_path" - part_name = "$part_name" - subsystem_name = "$subsystem_name" sources = get_target_outputs(":run_taihe") include_dirs = [ "./include" ] configs = [ @@ -61,6 +55,9 @@ taihe_shared_library("display_manager_brightness_taihe_native") { "hilog:libhilog", "power_manager:powermgr_client", ] + + subsystem_name = "powermgr" + part_name = "${displaymgr_part_name}" } generate_static_abc("brightness_abc") { @@ -72,8 +69,8 @@ generate_static_abc("brightness_abc") { } generate_static_abc("brightness_test_abc") { - base_url = "$displaymgr_framework_path/ets/taihe/ability_delegator/test" - files = [ "$displaymgr_framework_path/ets/taihe/ability_delegator/test/test_main.ets" ] + base_url = "$displaymgr_framework_path/ets/taihe/brightness/test" + files = [ "$displaymgr_framework_path/ets/taihe/brightness/test/test_main.ets" ] is_boot_abc = "True" device_dst_file = "/system/framework/brightness_test_abc.abc" } @@ -81,7 +78,7 @@ generate_static_abc("brightness_test_abc") { ohos_prebuilt_etc("brightness_etc") { source = "$target_out_dir/brightness_abc.abc" module_install_dir = "framework" - part_name = "$part_name" - subsystem_name = "$subsystem_name" + subsystem_name = "powermgr" + part_name = "${displaymgr_part_name}" deps = [ ":brightness_abc" ] } \ No newline at end of file diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/idl/ohos.brightness.taihe b/state_manager/frameworks/ets/taihe/brightness/idl/ohos.brightness.taihe similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/idl/ohos.brightness.taihe rename to state_manager/frameworks/ets/taihe/brightness/idl/ohos.brightness.taihe diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/src/ani_constructor.cpp b/state_manager/frameworks/ets/taihe/brightness/src/ani_constructor.cpp similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/src/ani_constructor.cpp rename to state_manager/frameworks/ets/taihe/brightness/src/ani_constructor.cpp diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/src/ohos.brightness.impl.cpp b/state_manager/frameworks/ets/taihe/brightness/src/ohos.brightness.impl.cpp similarity index 96% rename from state_manager/frameworks/ets/taihe/ability_delegator/src/ohos.brightness.impl.cpp rename to state_manager/frameworks/ets/taihe/brightness/src/ohos.brightness.impl.cpp index ae85261..e4422cb 100644 --- a/state_manager/frameworks/ets/taihe/ability_delegator/src/ohos.brightness.impl.cpp +++ b/state_manager/frameworks/ets/taihe/brightness/src/ohos.brightness.impl.cpp @@ -59,5 +59,8 @@ void SetValueInt(int32_t value) } } // namespace +// Since these macros are auto-generate, lint will cause false positive +// NOLINTBEGIN TH_EXPORT_CPP_API_SetValueContinuous(SetValueContinuous); TH_EXPORT_CPP_API_SetValueInt(SetValueInt); +// NOLINTEND \ No newline at end of file diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/test/test_main.ets b/state_manager/frameworks/ets/taihe/brightness/test/test_main.ets similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/test/test_main.ets rename to state_manager/frameworks/ets/taihe/brightness/test/test_main.ets diff --git a/state_manager/frameworks/ets/taihe/brightness/test/unittest/BUILD.gn b/state_manager/frameworks/ets/taihe/brightness/test/unittest/BUILD.gn new file mode 100644 index 0000000..9e93376 --- /dev/null +++ b/state_manager/frameworks/ets/taihe/brightness/test/unittest/BUILD.gn @@ -0,0 +1,56 @@ +# 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("//build/ohos/taihe_idl/taihe.gni") +import("../../../../../../../displaymgr.gni") + +module_output_path = "display_manager/display_manager" + +config("module_private_config") { + visibility = [ ":*" ] + + include_dirs = [ + "${taihe_generated_file_path}/include", + "${taihe_toolchain_path}/include", + "../../include", + ] +} + +ohos_unittest("brightness_taihe_native_test") { + module_out_path = module_output_path + + sources = [ + "brightness_ani_constructor_test.cpp", + "brightness_taihe_native_test.cpp", + "../../src/ohos.brightness.impl.cpp" + ] + + configs = [ + ":module_private_config", + "${displaymgr_utils_path}:coverage_flags", + ] + + deps = [ + "${displaymgr_framework_path}/ets/taihe/brightness:display_manager_brightness_taihe_native", + "${displaymgr_framework_path}/ets/taihe/brightness:run_taihe", + "${displaymgr_inner_api}:displaymgr", + ] + + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + "power_manager:powermgr_client", + "runtime_core:ani", + ] +} \ No newline at end of file diff --git a/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_ani_constructor_test.cpp b/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_ani_constructor_test.cpp new file mode 100644 index 0000000..84141cd --- /dev/null +++ b/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_ani_constructor_test.cpp @@ -0,0 +1,113 @@ +/* + * 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. + */ + +#include + +#include "ohos.brightness.ani.hpp" +#include "display_log.h" + +using namespace OHOS::DisplayPowerMgr; + +using namespace testing; +using namespace testing::ext; +namespace { +ani_status g_status1 = ANI_OK; +ani_status g_status2 = ANI_OK; +} + +namespace ohos::brightness { +ani_status ANIRegister(ani_env *env) +{ + return g_status1; +} +} + +namespace { +class BrightnessAniConstructorTest : public ::testing::Test { +public: + static void SetUpTestCase() {} + static void TearDownTestCase() {} + void SetUp() {} + void TearDown() {} +}; + +static ani_status GetEnv(ani_vm *vm, uint32_t version, ani_env **result) +{ + return g_status2; +} +/** + * @tc.name: BrightnessAniConstructorTest_001 + * @tc.desc: test AniConstructor + * @tc.type: FUNC + * @tc.require: issue#ICAK9Z + */ +HWTEST_F(BrightnessAniConstructorTest, BrightnessAniConstructorTest_001, TestSize.Level1) +{ + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_001 start"); + ani_vm vm; + __ani_vm_api mock_c_api = {.GetEnv = GetEnv}; + vm.c_api = &mock_c_api; + uint32_t result; + + ani_status status = ANI_Constructor(&vm, &result); + + EXPECT_EQ(status, ANI_OK); + EXPECT_EQ(result, ANI_VERSION_1); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_001 end"); +} + +/** + * @tc.name: BrightnessAniConstructorTest_002 + * @tc.desc: test AniConstructor + * @tc.type: FUNC + * @tc.require: issue#ICAK9Z + */ +HWTEST_F(BrightnessAniConstructorTest, BrightnessAniConstructorTest_002, TestSize.Level1) +{ + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_002 start"); + ani_vm vm; + __ani_vm_api mock_c_api = {.GetEnv = GetEnv}; + vm.c_api = &mock_c_api; + uint32_t result; + + g_status1 = ANI_ERROR; + ani_status status = ANI_Constructor(&vm, &result); + + EXPECT_EQ(status, ANI_ERROR); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_002 end"); +} + +/** + * @tc.name: BrightnessAniConstructorTest_003 + * @tc.desc: test AniConstructor + * @tc.type: FUNC + * @tc.require: issue#ICAK9Z + */ +HWTEST_F(BrightnessAniConstructorTest, BrightnessAniConstructorTest_003, TestSize.Level1) +{ + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_003 start"); + ani_vm vm; + __ani_vm_api mock_c_api = {.GetEnv = GetEnv}; + vm.c_api = &mock_c_api; + uint32_t result; + + g_status1 = ANI_OK; + g_status2 = ANI_ERROR; + ani_status status = ANI_Constructor(&vm, &result); + + EXPECT_EQ(status, ANI_ERROR); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessAniConstructorTest_003 end"); +} +} \ No newline at end of file diff --git a/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_taihe_native_test.cpp b/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_taihe_native_test.cpp new file mode 100644 index 0000000..c74184d --- /dev/null +++ b/state_manager/frameworks/ets/taihe/brightness/test/unittest/brightness_taihe_native_test.cpp @@ -0,0 +1,109 @@ +/* + * 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. + */ + +#include + +#include "ohos.brightness.proj.hpp" +#include "ohos.brightness.impl.hpp" +#include "ohos.brightness.user.hpp" +#include "taihe/runtime.hpp" +#include "display_power_mgr_client.h" +#include "display_log.h" +#include "display_mgr_errors.h" + +using namespace taihe; +using namespace ohos::brightness; +using namespace OHOS::DisplayPowerMgr; + +using namespace testing; +using namespace testing::ext; + +namespace { +DisplayErrors g_error = DisplayErrors::ERR_OK; +bool g_pass = false; +bool g_ret = false; +} + +namespace taihe { +void set_business_error(int32_t err_code, taihe::string_view msg) +{ + (void)err_code; + (void)msg; +} +} + +namespace OHOS::DisplayPowerMgr { +bool DisplayPowerMgrClient::SetBrightness(uint32_t value, uint32_t displayId, bool continuous) +{ + g_pass = true; + return g_ret; +} + +DisplayErrors DisplayPowerMgrClient::GetError() +{ + return g_error; +} +} // OHOS::PowerMgr + +namespace { +class BrightnessTaiheNativeTest : public ::testing::Test { +public: + static void SetUpTestCase() {} + static void TearDownTestCase() {} + void SetUp() {} + void TearDown() + { + g_pass = false; + g_ret = false; + } +}; + +/** + * @tc.name: BrightnessTaiheNativeTest_001 + * @tc.desc: test brightness taihe native + * @tc.type: FUNC + * @tc.require: issue#ICAK9Z + */ +HWTEST_F(BrightnessTaiheNativeTest, BrightnessTaiheNativeTest_001, TestSize.Level1) +{ + DISPLAY_HILOGI(LABEL_TEST, "BrightnessTaiheNativeTest_001 start"); + int32_t value = 255; + SetValueInt(value); + EXPECT_TRUE(g_pass); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessTaiheNativeTest_001 end"); +} + +/** + * @tc.name: BrightnessTaiheNativeTest_002 + * @tc.desc: test brightness taihe native + * @tc.type: FUNC + * @tc.require: issue#ICAK9Z + */ +HWTEST_F(BrightnessTaiheNativeTest, BrightnessTaiheNativeTest_002, TestSize.Level1) +{ + DISPLAY_HILOGI(LABEL_TEST, "BrightnessTaiheNativeTest_002 start"); + const int32_t value = 255; + const bool continuous = true; + SetValueContinuous(value, continuous); + + g_error = DisplayErrors::ERR_SYSTEM_API_DENIED; + SetValueContinuous(value, continuous); + + g_ret = true; + SetValueContinuous(value, continuous); + EXPECT_TRUE(g_pass); + DISPLAY_HILOGI(LABEL_TEST, "BrightnessTaiheNativeTest_002 end"); +} +} diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/test/xts/Brightness.test.ets b/state_manager/frameworks/ets/taihe/brightness/test/xts/Brightness.test.ets similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/test/xts/Brightness.test.ets rename to state_manager/frameworks/ets/taihe/brightness/test/xts/Brightness.test.ets diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/test/xts/List.test.ets b/state_manager/frameworks/ets/taihe/brightness/test/xts/List.test.ets similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/test/xts/List.test.ets rename to state_manager/frameworks/ets/taihe/brightness/test/xts/List.test.ets diff --git a/state_manager/frameworks/ets/taihe/ability_delegator/test/xts/Util.test.ets b/state_manager/frameworks/ets/taihe/brightness/test/xts/Util.test.ets similarity index 100% rename from state_manager/frameworks/ets/taihe/ability_delegator/test/xts/Util.test.ets rename to state_manager/frameworks/ets/taihe/brightness/test/xts/Util.test.ets -- Gitee