diff --git a/test/mock/core/pipeline/mock_pipeline_context.cpp b/test/mock/core/pipeline/mock_pipeline_context.cpp index 2b3f2e88f3ca44ae90e98b9de211610c5697e99e..a53ae2651335ed8097d58f15c97db7c40eede423 100644 --- a/test/mock/core/pipeline/mock_pipeline_context.cpp +++ b/test/mock/core/pipeline/mock_pipeline_context.cpp @@ -151,6 +151,7 @@ RefPtr MockPipelineContext::pipeline_; // mock_pipeline_context ======================================================= void MockPipelineContext::SetUp() { + // test tdd pipeline_ = AceType::MakeRefPtr(); pipeline_->eventManager_ = AceType::MakeRefPtr(); pipeline_->windowManager_ = AceType::MakeRefPtr(); diff --git a/test/unittest/interfaces/BUILD.gn b/test/unittest/interfaces/BUILD.gn index 9dbcf70257bad2496682c4b0134457307a42aaa6..857608d530c5ce4b44d904ccf6170dff1de6a4ee 100644 --- a/test/unittest/interfaces/BUILD.gn +++ b/test/unittest/interfaces/BUILD.gn @@ -1280,6 +1280,7 @@ ohos_unittest("native_render_node_property_test") { "$ace_root/interfaces/native/node/native_node_napi.cpp", "$ace_root/interfaces/native/node/node_extened.cpp", "$ace_root/interfaces/native/node/node_model.cpp", + "$ace_root/interfaces/native/node/node_model_safely.cpp", "$ace_root/interfaces/native/node/node_node_relative_container.cpp", "$ace_root/interfaces/native/node/node_transition.cpp", "$ace_root/interfaces/native/node/node_utils.cpp", @@ -1304,19 +1305,19 @@ ohos_unittest("native_render_node_property_test") { ] deps = [ - "$ace_root/test/unittest::ace_base", - "$ace_root/test/unittest::ace_components_base", - "$ace_root/test/unittest::ace_components_event", - "$ace_root/test/unittest::ace_components_gestures", - "$ace_root/test/unittest::ace_components_layout", - "$ace_root/test/unittest::ace_components_manager", - "$ace_root/test/unittest::ace_components_mock", - "$ace_root/test/unittest::ace_components_pattern", - "$ace_root/test/unittest::ace_components_property", - "$ace_root/test/unittest::ace_components_render", - "$ace_root/test/unittest::ace_components_syntax", - "$ace_root/test/unittest::ace_core_animation", - "$ace_root/test/unittest::ace_core_extra", + "$ace_root/test/unittest:ace_base", + "$ace_root/test/unittest:ace_components_base", + "$ace_root/test/unittest:ace_components_event", + "$ace_root/test/unittest:ace_components_gestures", + "$ace_root/test/unittest:ace_components_layout", + "$ace_root/test/unittest:ace_components_manager", + "$ace_root/test/unittest:ace_components_mock", + "$ace_root/test/unittest:ace_components_pattern", + "$ace_root/test/unittest:ace_components_property", + "$ace_root/test/unittest:ace_components_render", + "$ace_root/test/unittest:ace_components_syntax", + "$ace_root/test/unittest:ace_core_animation", + "$ace_root/test/unittest:ace_core_extra", ] external_deps = [ @@ -1328,8 +1329,8 @@ ohos_unittest("native_render_node_property_test") { "graphic_2d:librender_service_client", "graphic_2d:native_drawing_ndk", "hilog:libhilog", - "image_framwork:image", - "image_framwork:image_native", + "image_framework:image", + "image_framework:image_native", "napi:ace_napi", "resource_management:global_resmgr", ] diff --git a/test/unittest/interfaces/native_render_node_property_test.cpp b/test/unittest/interfaces/native_render_node_property_test.cpp index 27684bb2cc6f9ab03974e59262e19641d4a99792..652a1472292faf29796b5b7b6855f42c5770ab6c 100644 --- a/test/unittest/interfaces/native_render_node_property_test.cpp +++ b/test/unittest/interfaces/native_render_node_property_test.cpp @@ -22,7 +22,7 @@ #include "native_node.h" #include "native_render.h" #include "native_type.h" -#include "interfaces/native/node/node_extended.h" +#include "interfaces/native/node/node_extened.h" #include "interfaces/native/node/node_model.h" #include "interfaces/native/node/render_node.h" #include "interfaces/native/node/styled_string.h" @@ -151,12 +151,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest005, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - int32_t getSize_width = 0; - int32_t getSize_height = 0; + int32_t getSizeWidth = 0; + int32_t getSizeHeight = 0; OH_ArkUI_RenderNodeUtils_SetSize(rootRenderNode, 300, 400); - OH_ArkUI_RenderNodeUtils_GetSize(rootRenderNode, &getSize_width, &getSize_height); - ASSERT_EQ(getSize_width, 300); - ASSERT_EQ(getSize_height, 400); + OH_ArkUI_RenderNodeUtils_GetSize(rootRenderNode, &getSizeWidth, &getSizeHeight); + ASSERT_EQ(getSizeWidth, 300); + ASSERT_EQ(getSizeHeight, 400); } /** @@ -173,12 +173,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest006, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - int32_t setPosition_x = 0; - int32_t setPosition_y = 0; + int32_t setPositionX = 0; + int32_t setPositionY = 0; OH_ArkUI_RenderNodeUtils_SetPosition(rootRenderNode, 200, 1500); - OH_ArkUI_RenderNodeUtils_GetPosition(rootRenderNode, &setPosition_x, &setPosition_y); - ASSERT_EQ(setPosition_x, 200); - ASSERT_EQ(setPosition_y, 1500); + OH_ArkUI_RenderNodeUtils_GetPosition(rootRenderNode, &setPositionX, &setPositionY); + ASSERT_EQ(setPositionX, 200); + ASSERT_EQ(setPositionY, 1500); } /** @@ -195,12 +195,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest007, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - float setPivot_x = 0; - float setPivot_y = 0; + float setPivotX = 0; + float setPivotY = 0; OH_ArkUI_RenderNodeUtils_SetPivot(rootRenderNode, 5655, 232); - OH_ArkUI_RenderNodeUtils_GetPivot(rootRenderNode, &setPivot_x, &setPivot_y); - ASSERT_EQ(setPivot_x, 5655); - ASSERT_EQ(setPivot_y, 232); + OH_ArkUI_RenderNodeUtils_GetPivot(rootRenderNode, &setPivotX, &setPivotY); + ASSERT_EQ(setPivotX, 5655); + ASSERT_EQ(setPivotY, 232); } /** @@ -217,12 +217,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest008, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - float setScale_x = 0; - float setScale_y = 0; + float setScaleX = 0; + float setScaleY = 0; OH_ArkUI_RenderNodeUtils_SetScale(rootRenderNode, 36, 39); - OH_ArkUI_RenderNodeUtils_GetScale(rootRenderNode, &setScale_x, &setScale_y); - ASSERT_EQ(setScale_x, 36); - ASSERT_EQ(setScale_y, 39); + OH_ArkUI_RenderNodeUtils_GetScale(rootRenderNode, &setScaleX, &setScaleY); + ASSERT_EQ(setScaleX, 36); + ASSERT_EQ(setScaleY, 39); } /** @@ -239,12 +239,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest009, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - float setTranslation_x = 0; - float setTranslation_y = 0; + float setTranslationX = 0; + float setTranslationY = 0; OH_ArkUI_RenderNodeUtils_SetTranslation(rootRenderNode, 33, 44); - OH_ArkUI_RenderNodeUtils_GetTranslation(rootRenderNode, &setTranslation_x, &setTranslation_y); - ASSERT_EQ(setTranslation_x, 33); - ASSERT_EQ(setTranslation_y, 44); + OH_ArkUI_RenderNodeUtils_GetTranslation(rootRenderNode, &setTranslationX, &setTranslationY); + ASSERT_EQ(setTranslationX, 33); + ASSERT_EQ(setTranslationY, 44); } /** @@ -261,14 +261,14 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest010, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - float setRotation_x = 0; - float setRotation_y = 0; - float setRotation_z = 0; + float setRotationX = 0; + float setRotationY = 0; + float setRotationZ = 0; OH_ArkUI_RenderNodeUtils_SetRotation(rootRenderNode, 414, 55, 12); - OH_ArkUI_RenderNodeUtils_GetRotation(rootRenderNode, &setRotation_x, &setRotation_y, &setRotation_z); - ASSERT_EQ(setRotation_x, 414); - ASSERT_EQ(setRotation_y, 55); - ASSERT_EQ(setRotation_z, 12); + OH_ArkUI_RenderNodeUtils_GetRotation(rootRenderNode, &setRotationX, &setRotationY, &setRotationZ); + ASSERT_EQ(setRotationX, 414); + ASSERT_EQ(setRotationY, 55); + ASSERT_EQ(setRotationZ, 12); } /** @@ -305,12 +305,12 @@ HWTEST_F(NativeRenderNodePropertyTest, NativeRenderNodePropertyTest012, TestSize auto rootRenderNode = OH_ArkUI_RenderNodeUtils_CreateNode(); ASSERT_NE(rootRenderNode, nullptr); - int32_t shadowOffset_x = 0; - int32_t shadowOffset_y = 0; + int32_t shadowOffsetX = 0; + int32_t shadowOffsetY = 0; OH_ArkUI_RenderNodeUtils_SetShadowOffset(rootRenderNode, 27, 56); - OH_ArkUI_RenderNodeUtils_GetShadowOffset(rootRenderNode, &shadowOffset_x, &shadowOffset_y); - ASSERT_EQ(shadowOffset_x, 27); - ASSERT_EQ(shadowOffset_y, 56); + OH_ArkUI_RenderNodeUtils_GetShadowOffset(rootRenderNode, &shadowOffsetX, &shadowOffsetY); + ASSERT_EQ(shadowOffsetX, 27); + ASSERT_EQ(shadowOffsetY, 56); } /**