From c21ca723dce55c1e47d85a968c2e0ce7ff511986 Mon Sep 17 00:00:00 2001 From: kovalevsergey Date: Thu, 15 May 2025 13:54:13 +0300 Subject: [PATCH 1/5] test restore Signed-off-by: kovalevsergey Change-Id: I712b5d264b98ef27b33500f583f9cbb1339f0fac --- .../common_shape_method_modifier.cpp | 1 + test/unittest/capi/modifiers/BUILD.gn | 36 +++--- ...n_shape_method_modifier_resources_test.cpp | 12 +- .../common_shape_method_modifier_test.cpp | 52 +++++--- .../capi/modifiers/counter_modifier_test.cpp | 52 ++++---- .../modifiers/data_panel_modifier_test.cpp | 103 +++++++++------- .../modifiers/date_picker_modifier_test.cpp | 64 ++++++---- .../capi/modifiers/divider_modifier_test.cpp | 111 +++++++++++------- .../capi/modifiers/flex_modifier_test.cpp | 38 +++--- .../modifiers/folder_stack_modifier_test.cpp | 21 ++-- .../form_component_modifier_test.cpp | 38 +++--- 11 files changed, 322 insertions(+), 206 deletions(-) diff --git a/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp b/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp index 21bfe3e2918..6e06aab2ae9 100644 --- a/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp @@ -132,6 +132,7 @@ void StrokeDashArrayImpl(Ark_NativePointer node, { auto frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); + CHECK_NULL_VOID(value); auto dashArray = Converter::OptConvert>(*value); if (!dashArray) { // TODO: Reset value diff --git a/test/unittest/capi/modifiers/BUILD.gn b/test/unittest/capi/modifiers/BUILD.gn index 8484b33d484..a747949efb3 100644 --- a/test/unittest/capi/modifiers/BUILD.gn +++ b/test/unittest/capi/modifiers/BUILD.gn @@ -52,18 +52,18 @@ ace_unittest("capi_all_modifiers_test") { #"common_method_modifier_test7.cpp", #"common_method_modifier_test8.cpp", #"common_method_modifier_test9.cpp", - #"common_modifier_test.cpp", - #"common_shape_method_modifier_resources_test.cpp", - #"common_shape_method_modifier_test.cpp", - #"counter_modifier_test.cpp", - #"data_panel_modifier_test.cpp", - #"date_picker_modifier_test.cpp", - #"divider_modifier_test.cpp", - #"effect_component_modifier_test.cpp", - #"ellipse_modifier_test.cpp", - #"flex_modifier_test.cpp", - #"folder_stack_modifier_test.cpp", - #"form_component_modifier_test.cpp", + "common_modifier_test.cpp", + "common_shape_method_modifier_resources_test.cpp", + "common_shape_method_modifier_test.cpp", + "counter_modifier_test.cpp", + "data_panel_modifier_test.cpp", + "date_picker_modifier_test.cpp", + "divider_modifier_test.cpp", + "effect_component_modifier_test.cpp", + "ellipse_modifier_test.cpp", + "flex_modifier_test.cpp", + "folder_stack_modifier_test.cpp", + "form_component_modifier_test.cpp", #"form_link_modifier_test.cpp", #"gauge_modifier_test.cpp", #"grid_col_modifier_test.cpp", @@ -146,12 +146,12 @@ ace_unittest("capi_all_modifiers_test") { #"text_timer_modifier_test.cpp", #"time_picker_modifier_test.cpp", #"toggle_modifier_test.cpp", - #"video_modifier_test.cpp", - #"water_flow_modifier_test.cpp", - #"web_modifier_test.cpp", - #"web_modifier_test2.cpp", - #"web_modifier_test3.cpp", - #"windowscene_modifier_test.cpp", + "video_modifier_test.cpp", + "water_flow_modifier_test.cpp", + "web_modifier_test.cpp", + "web_modifier_test2.cpp", + "web_modifier_test3.cpp", + "windowscene_modifier_test.cpp", ] sources += [ "generated/test_fixtures.cpp", diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp index 03b1c20ef34..5ac9d7a72f4 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp @@ -86,12 +86,12 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setStrokeWidthTestResources, Te typedef std::pair OneTestStep; const std::vector testPlan = { - { Converter::ArkValue(FAKE_RES_ID), 10 } + { Converter::ArkValue(FAKE_RES_ID), 0 } }; for (const auto &[arkLength, expected]: testPlan) { - modifier_->setStrokeWidth(node_, &arkLength); - jsonValue = GetJsonValue(node_); + auto optLength = Converter::ArkValue(arkLength); + modifier_->setStrokeWidth(node_, &optLength); result = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); EXPECT_NEAR(result, expected, FLT_EPSILON); } @@ -106,7 +106,8 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setFillOpacityTestResources, Te { std::unique_ptr jsonValue; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - modifier_->setFillOpacity(node_, &value); + auto optValue = Converter::ArkValue(value); + modifier_->setFillOpacity(node_, &optValue); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_FILL_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); @@ -122,7 +123,8 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setStrokeOpacityTestResources, { std::unique_ptr jsonValue; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - modifier_->setStrokeOpacity(node_, &value); + auto optValue = Converter::ArkValue(value); + modifier_->setStrokeOpacity(node_, &optValue); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp index 41d8bb8c805..8118359223e 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp @@ -87,7 +87,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::BLACK.ToString()); for (const auto &[arkResColor, expected]: TEST_COLOR_PLAN) { - modifier_->setStroke(node_, &arkResColor); + auto optResColor = Converter::ArkValue(arkResColor); + modifier_->setStroke(node_, &optResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -107,7 +108,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setFillTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::BLACK.ToString()); for (const auto &[arkResColor, expected]: TEST_COLOR_PLAN) { - modifier_->setFill(node_, &arkResColor); + auto optResColor = Converter::ArkValue(arkResColor); + modifier_->setFill(node_, &optResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -140,9 +142,10 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestValidValues, TestSiz // Initial setup inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_BUTT; + auto optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); // Test - modifier_->setStrokeLineCap(node_, inputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); // Initial verification jsonValue = GetJsonValue(node_); @@ -151,13 +154,16 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestValidValues, TestSiz // Verifying attribute's other values inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_ROUND; - modifier_->setStrokeLineCap(node_, inputValueStrokeLineCap); + optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_CAP_NAME); EXPECT_EQ(resultStr, "LineCapStyle.Round"); inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_SQUARE; - modifier_->setStrokeLineCap(node_, inputValueStrokeLineCap); + optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); + jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_CAP_NAME); EXPECT_EQ(resultStr, "LineCapStyle.Square"); @@ -176,9 +182,10 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestInvalidValues, TestS // Initial setup inputValueStrokeLineCap = static_cast(-1); + auto optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); // Test - modifier_->setStrokeLineCap(node_, inputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); // Initial verification jsonValue = GetJsonValue(node_); @@ -213,9 +220,10 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestValidValues, TestSi // Initial setup inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_MITER; + auto optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); // Test - modifier_->setStrokeLineJoin(node_, inputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); // Initial verification jsonValue = GetJsonValue(node_); @@ -224,13 +232,15 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestValidValues, TestSi // Verifying attribute's other values inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_ROUND; - modifier_->setStrokeLineJoin(node_, inputValueStrokeLineJoin); + optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_JOIN_NAME); EXPECT_EQ(resultStr, "LineJoinStyle.Round"); inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_BEVEL; - modifier_->setStrokeLineJoin(node_, inputValueStrokeLineJoin); + optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_JOIN_NAME); EXPECT_EQ(resultStr, "LineJoinStyle.Bevel"); @@ -249,9 +259,10 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestInvalidValues, Test // Initial setup inputValueStrokeLineJoin = static_cast(-1); + auto optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); // Test - modifier_->setStrokeLineJoin(node_, inputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); // Initial verification jsonValue = GetJsonValue(node_); @@ -296,7 +307,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeOpacityTest, TestSize.Level1) }; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_TEST_PLAN) { - modifier_->setStrokeOpacity(node_, &value); + auto optValue = Converter::ArkValue(value); + modifier_->setStrokeOpacity(node_, &optValue); auto checkVal = GetStringAttribute(node_, ATTRIBUTE_STROKE_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); } @@ -339,7 +351,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setFillOpacityTest, TestSize.Level1) }; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_TEST_PLAN) { - modifier_->setFillOpacity(node_, &value); + auto optValue = Converter::ArkValue(value); + modifier_->setFillOpacity(node_, &optValue); auto checkVal = GetStringAttribute(node_, ATTRIBUTE_FILL_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); } @@ -385,7 +398,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeWidthTestValidValues, TestSize. }; for (const auto &[arkLength, expected]: testPlan) { - modifier_->setStrokeWidth(node_, &arkLength); + auto optLength = Converter::ArkValue(arkLength); + modifier_->setStrokeWidth(node_, &optLength); jsonValue = GetJsonValue(node_); result = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); EXPECT_NEAR(result, expected, FLT_EPSILON); @@ -438,7 +452,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashOffsetTest, TestSize.Level1 std::string resultStr; for (const auto &[arkValue, expected]: testPlan) { - modifier_->setStrokeDashOffset(node_, &arkValue); + auto optValue = Converter::ArkValue(arkValue); + modifier_->setStrokeDashOffset(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_DASH_OFFSET_NAME); @@ -492,7 +507,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeMiterLimitTest, TestSize.Level1 std::string resultStr; for (const auto &[arkValue, expected]: testPlan) { - modifier_->setStrokeMiterLimit(node_, &arkValue); + auto optValue = Converter::ArkValue(arkValue); + modifier_->setStrokeMiterLimit(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_MITER_LIMIT_NAME); @@ -524,7 +540,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setAntiAliasTest, TestSize.Level1) EXPECT_EQ(checkVal, "true"); for (const auto& [value, expectVal] : BOOL_TEST_PLAN) { - modifier_->setAntiAlias(node_, value); + auto optValue = Converter::ArkValue(value); + modifier_->setAntiAlias(node_, &optValue); auto fullJson = GetJsonValue(node_); checkVal = GetAttrValue(fullJson, PROP_NAME); EXPECT_EQ(checkVal, expectVal); @@ -557,7 +574,8 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashArrayTest, TestSize.Level1) EXPECT_EQ(checkVal->GetArraySize(), 0); for (const auto& [value, expectVal] : TEST_PLAN) { - modifier_->setStrokeDashArray(node_, &value); + auto optValue = Converter::ArkValue(value); + modifier_->setStrokeDashArray(node_, &optValue); auto fullJson = GetJsonValue(node_); checkVal = GetAttrValue>(fullJson, propName); ASSERT_TRUE(checkVal->IsArray()); diff --git a/test/unittest/capi/modifiers/counter_modifier_test.cpp b/test/unittest/capi/modifiers/counter_modifier_test.cpp index d75e47ea204..3d5f3488560 100644 --- a/test/unittest/capi/modifiers/counter_modifier_test.cpp +++ b/test/unittest/capi/modifiers/counter_modifier_test.cpp @@ -73,15 +73,14 @@ HWTEST_F(CounterModifierTest, setEnableDecTestDefaultValues, TestSize.Level1) HWTEST_F(CounterModifierTest, setEnableDecTestValidValues, TestSize.Level1) { std::string strResult; - Ark_Boolean inputValue; - inputValue = Converter::ArkValue(false); - modifier_->setEnableDec(node_, inputValue); + auto inputValue = Converter::ArkValue(false); + modifier_->setEnableDec(node_, &inputValue); strResult = GetStringAttribute(node_, ATTRIBUTE_ENABLE_DEC_NAME); EXPECT_EQ(strResult, "false"); - inputValue = Converter::ArkValue(true); - modifier_->setEnableDec(node_, inputValue); + inputValue = Converter::ArkValue(true); + modifier_->setEnableDec(node_, &inputValue); strResult = GetStringAttribute(node_, ATTRIBUTE_ENABLE_DEC_NAME); EXPECT_EQ(strResult, "true"); } @@ -107,15 +106,14 @@ HWTEST_F(CounterModifierTest, setEnableIncTestDefaultValues, TestSize.Level1) HWTEST_F(CounterModifierTest, setEnableIncTestValidValues, TestSize.Level1) { std::string strResult; - Ark_Boolean inputValue; - inputValue = Converter::ArkValue(false); - modifier_->setEnableInc(node_, inputValue); + auto inputValue = Converter::ArkValue(false); + modifier_->setEnableInc(node_, &inputValue); strResult = GetStringAttribute(node_, ATTRIBUTE_ENABLE_INC_NAME); EXPECT_EQ(strResult, "false"); - inputValue = Converter::ArkValue(true); - modifier_->setEnableInc(node_, inputValue); + inputValue = Converter::ArkValue(true); + modifier_->setEnableInc(node_, &inputValue); strResult = GetStringAttribute(node_, ATTRIBUTE_ENABLE_INC_NAME); EXPECT_EQ(strResult, "true"); } @@ -148,8 +146,9 @@ HWTEST_F(CounterModifierTest, setOnIncTest, TestSize.Level1) }; VoidCallback arkCallback = Converter::ArkValue(checkCallback, contextId); + auto optCallback = Converter::ArkValue(arkCallback); - modifier_->setOnInc(node_, &arkCallback); + modifier_->setOnInc(node_, &optCallback); EXPECT_EQ(checkEvent.has_value(), false); subGestureHub->ActClick(); @@ -186,8 +185,9 @@ HWTEST_F(CounterModifierTest, setOnDecTest, TestSize.Level1) }; VoidCallback arkCallback = Converter::ArkValue(checkCallback, contextId); + auto optCallback = Converter::ArkValue(arkCallback); - modifier_->setOnDec(node_, &arkCallback); + modifier_->setOnDec(node_, &optCallback); EXPECT_EQ(checkEvent.has_value(), false); subGestureHub->ActClick(); @@ -225,7 +225,8 @@ HWTEST_F(CounterModifierTest, setBackgroundColorTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::TRANSPARENT.ToString()); for (const auto &[arkResColor, expected]: testPlan) { - commonModifier_->setBackgroundColor0(node_, &arkResColor); + auto optResColor = Converter::ArkValue(arkResColor); + commonModifier_->setBackgroundColor0(node_, &optResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -264,7 +265,8 @@ HWTEST_F(CounterModifierTest, setWidth0TestValidValues, TestSize.Level1) for (const auto &[arkLength, expected]: testPlan) { Ark_Length inputValue = Converter::ArkValue(arkLength); - commonModifier_->setWidth0(node_, &inputValue); + auto optValue = Converter::ArkValue(inputValue); + commonModifier_->setWidth0(node_, &optValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, expected); } @@ -275,7 +277,7 @@ HWTEST_F(CounterModifierTest, setWidth0TestValidValues, TestSize.Level1) * @tc.desc: * @tc.type: FUNC */ -HWTEST_F(CounterModifierTest, setWidth0TestInvalidValues, TestSize.Level1) +HWTEST_F(CounterModifierTest, DISABLED_setWidth0TestInvalidValues, TestSize.Level1) { static const std::vector testPlan = { Converter::ArkValue(-2.45f), @@ -288,7 +290,7 @@ HWTEST_F(CounterModifierTest, setWidth0TestInvalidValues, TestSize.Level1) }; for (const auto &arkLength : testPlan) { - Ark_Length inputValue = Converter::ArkValue(arkLength); + auto inputValue = Converter::ArkValue(arkLength); commonModifier_->setWidth0(node_, &inputValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, ATTRIBUTE_WIDTH_DEFAULT_VALUE); @@ -331,7 +333,7 @@ HWTEST_F(CounterModifierTest, setHeight0TestValidValues, TestSize.Level1) }; for (const auto &[arkLength, expected]: testPlan) { - Ark_Length inputValue = Converter::ArkValue(arkLength); + auto inputValue = Converter::ArkValue(arkLength); commonModifier_->setHeight0(node_, &inputValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, expected); @@ -343,7 +345,7 @@ HWTEST_F(CounterModifierTest, setHeight0TestValidValues, TestSize.Level1) * @tc.desc: * @tc.type: FUNC */ -HWTEST_F(CounterModifierTest, setHeight0TestInvalidValues, TestSize.Level1) +HWTEST_F(CounterModifierTest, DISABLED_setHeight0TestInvalidValues, TestSize.Level1) { static const std::vector testPlan = { Converter::ArkValue(-2.45f), @@ -356,7 +358,7 @@ HWTEST_F(CounterModifierTest, setHeight0TestInvalidValues, TestSize.Level1) }; for (const auto &arkLength : testPlan) { - Ark_Length inputValue = Converter::ArkValue(arkLength); + auto inputValue = Converter::ArkValue(arkLength); commonModifier_->setHeight0(node_, &inputValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, ATTRIBUTE_HEIGHT_DEFAULT_VALUE); @@ -391,7 +393,8 @@ HWTEST_F(CounterModifierTest, setSizeTestValidHeightValues, TestSize.Level1) Ark_SizeOptions inputValue; inputValue.height = Converter::ArkValue(arkLength); inputValue.width = Converter::ArkValue(Ark_Empty()); - commonModifier_->setSize(node_, &inputValue); + auto optValue = Converter::ArkValue(inputValue); + commonModifier_->setSize(node_, &optValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, expected); strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); @@ -423,7 +426,8 @@ HWTEST_F(CounterModifierTest, setSizeTestValidWidthValues, TestSize.Level1) Ark_SizeOptions inputValue; inputValue.width = Converter::ArkValue(arkLength); inputValue.height = Converter::ArkValue(Ark_Empty()); - commonModifier_->setSize(node_, &inputValue); + auto optValue = Converter::ArkValue(inputValue); + commonModifier_->setSize(node_, &optValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, expected); strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); @@ -453,7 +457,8 @@ HWTEST_F(CounterModifierTest, setSizeTestInvalidValues, TestSize.Level1) for (const auto &arkLength : testPlan) { inputValue.width = Converter::ArkValue(arkLength); inputValue.height = Converter::ArkValue(Ark_Empty()); - commonModifier_->setSize(node_, &inputValue); + auto optValue = Converter::ArkValue(inputValue); + commonModifier_->setSize(node_, &optValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, ATTRIBUTE_WIDTH_DEFAULT_VALUE); strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); @@ -463,7 +468,8 @@ HWTEST_F(CounterModifierTest, setSizeTestInvalidValues, TestSize.Level1) for (const auto &arkLength : testPlan) { inputValue.height = Converter::ArkValue(arkLength); inputValue.width = Converter::ArkValue(Ark_Empty()); - commonModifier_->setSize(node_, &inputValue); + auto optValue = Converter::ArkValue(inputValue); + commonModifier_->setSize(node_, &optValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, ATTRIBUTE_WIDTH_DEFAULT_VALUE); strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); diff --git a/test/unittest/capi/modifiers/data_panel_modifier_test.cpp b/test/unittest/capi/modifiers/data_panel_modifier_test.cpp index 4a914c9a592..3d9a0dcfe6d 100644 --- a/test/unittest/capi/modifiers/data_panel_modifier_test.cpp +++ b/test/unittest/capi/modifiers/data_panel_modifier_test.cpp @@ -293,7 +293,8 @@ HWTEST_F(DataPanelModifierTest, setCloseEffectTestValidValues, TestSize.Level1) inputValueCloseEffect = initValueCloseEffect; for (auto&& value: closeEffectCloseEffectValidValues) { inputValueCloseEffect = std::get<1>(value); - modifier_->setCloseEffect(node_, inputValueCloseEffect); + auto optValue = Converter::ArkValue(inputValueCloseEffect); + modifier_->setCloseEffect(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_CLOSE_EFFECT_NAME); expectedStr = std::get<2>(value); @@ -340,7 +341,8 @@ HWTEST_F(DataPanelModifierTest, setStrokeWidthTestValidValues, TestSize.Level1) inputValueStrokeWidth = initValueStrokeWidth; for (auto&& value: strokeWidthStrokeWidthValidValues) { inputValueStrokeWidth = std::get<1>(value); - modifier_->setStrokeWidth(node_, &inputValueStrokeWidth); + auto optValue = Converter::ArkValue(inputValueStrokeWidth); + modifier_->setStrokeWidth(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); expectedStr = std::get<2>(value); @@ -372,7 +374,8 @@ HWTEST_F(DataPanelModifierTest, setStrokeWidthTestResourceValues, TestSize.Level inputValueStrokeWidth = initValueStrokeWidth; for (auto&& value: strokeWidthStrokeWidthResourceValues) { inputValueStrokeWidth = std::get<1>(value); - modifier_->setStrokeWidth(node_, &inputValueStrokeWidth); + auto optValue = Converter::ArkValue(inputValueStrokeWidth); + modifier_->setStrokeWidth(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); expectedStr = std::get<2>(value); @@ -404,7 +407,8 @@ HWTEST_F(DataPanelModifierTest, setStrokeWidthTestInvalidValues, TestSize.Level1 inputValueStrokeWidth = initValueStrokeWidth; for (auto&& value: strokeWidthStrokeWidthInvalidValues) { inputValueStrokeWidth = std::get<1>(value); - modifier_->setStrokeWidth(node_, &inputValueStrokeWidth); + auto optValue = Converter::ArkValue(inputValueStrokeWidth); + modifier_->setStrokeWidth(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); expectedStr = std::get<2>(value); @@ -457,7 +461,8 @@ HWTEST_F(DataPanelModifierTest, setTrackBackgroundColorTestValidValues, TestSize inputValueTrackBackgroundColor = initValueTrackBackgroundColor; for (auto&& value: trackBackgroundColorValidValues) { inputValueTrackBackgroundColor = std::get<1>(value); - modifier_->setTrackBackgroundColor(node_, &inputValueTrackBackgroundColor); + auto optValue = Converter::ArkValue(inputValueTrackBackgroundColor); + modifier_->setTrackBackgroundColor(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_TRACK_BACKGROUND_COLOR_NAME); expectedStr = std::get<2>(value); @@ -492,7 +497,8 @@ HWTEST_F(DataPanelModifierTest, setTrackBackgroundColorTestValidResourceValues, inputValueTrackBackgroundColor = initValueTrackBackgroundColor; for (auto&& value: trackBackgroundColorValidResourceValues) { inputValueTrackBackgroundColor = std::get<1>(value); - modifier_->setTrackBackgroundColor(node_, &inputValueTrackBackgroundColor); + auto optValue = Converter::ArkValue(inputValueTrackBackgroundColor); + modifier_->setTrackBackgroundColor(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_TRACK_BACKGROUND_COLOR_NAME); expectedStr = std::get<2>(value); @@ -529,7 +535,8 @@ HWTEST_F(DataPanelModifierTest, setTrackBackgroundColorTestInvalidValues, TestSi inputValueTrackBackgroundColor = initValueTrackBackgroundColor; for (auto&& value: trackBackgroundColorInvalidValues) { inputValueTrackBackgroundColor = std::get<1>(value); - modifier_->setTrackBackgroundColor(node_, &inputValueTrackBackgroundColor); + auto optValue = Converter::ArkValue(inputValueTrackBackgroundColor); + modifier_->setTrackBackgroundColor(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_TRACK_BACKGROUND_COLOR_NAME); expectedStr = std::get<2>(value); @@ -581,8 +588,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestStringValidValues, TestSize.Le Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -622,8 +629,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestStringInvalidValues, TestSize. Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -663,8 +670,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestNumberValidValues, TestSize.Le Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -704,8 +711,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestEnumValidValues, TestSize.Leve Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -745,8 +752,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestEnumInvalidValues, TestSize.Le Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -786,8 +793,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestResourceValidValues, TestSize. Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -841,8 +848,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestLinearGradientValidValues, Tes Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -878,8 +885,8 @@ HWTEST_F(DataPanelModifierTest, setValueColorsTestLinearGradientInvalidValues, T Converter::ArkArrayHolder colorArrayHolder(colorArray); auto arkColorArray = colorArrayHolder.ArkValue(); - - modifier_->setValueColors(node_, &arkColorArray); + auto optValue = Converter::ArkValue(arkColorArray); + modifier_->setValueColors(node_, &optValue); std::unique_ptr jsonValue = GetJsonValue(node_); auto jsonArray = GetAttrValue>(jsonValue, ATTRIBUTE_VALUE_COLORS_NAME); @@ -1024,7 +1031,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestRadiusValidValues, TestSize.Le inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowRadiusValidValues) { inputValueTrackShadow.radius = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_RADIUS_NAME); @@ -1057,7 +1065,8 @@ HWTEST_F(DataPanelModifierTest, DISABLED_setTrackShadowTestRadiusInvalidValues, inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowRadiusInvalidValues) { inputValueTrackShadow.radius = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_RADIUS_NAME); @@ -1090,7 +1099,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestOffsetXValidValues, TestSize.L inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowOffsetXValidValues) { inputValueTrackShadow.offsetX = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_OFFSET_X_NAME); @@ -1123,7 +1133,8 @@ HWTEST_F(DataPanelModifierTest, DISABLED_setTrackShadowTestOffsetXInvalidValues, inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowOffsetXInvalidValues) { inputValueTrackShadow.offsetX = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_OFFSET_X_NAME); @@ -1156,7 +1167,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestOffsetYValidValues, TestSize.L inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowOffsetYValidValues) { inputValueTrackShadow.offsetY = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_OFFSET_Y_NAME); @@ -1189,7 +1201,8 @@ HWTEST_F(DataPanelModifierTest, DISABLED_setTrackShadowTestOffsetYInvalidValues, inputValueTrackShadow = initValueTrackShadow; for (auto&& value: trackShadowOffsetYInvalidValues) { inputValueTrackShadow.offsetY = std::get<1>(value); - modifier_->setTrackShadow(node_, &inputValueTrackShadow); + auto optValue = Converter::ArkValue(inputValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); resultTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); resultStr = GetAttrValue(resultTrackShadow, ATTRIBUTE_TRACK_SHADOW_OFFSET_Y_NAME); @@ -1229,8 +1242,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorStringValidValues, TestSi initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1285,8 +1298,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorStringInvalidValues, Test initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1341,8 +1354,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorNumberValidValues, TestSi initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1397,8 +1410,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorEnumValidValues, TestSize initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1453,8 +1466,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorEnumInvalidValues, TestSi initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1509,8 +1522,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorResourceValidValues, Test initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1565,8 +1578,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorLinearGradientValidValues initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); @@ -1617,8 +1630,8 @@ HWTEST_F(DataPanelModifierTest, setTrackShadowTestColorLinearGradientInvalidValu initValueTrackShadow.offsetX = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.offsetY = Converter::ArkValue(Ark_Empty()); initValueTrackShadow.colors = Converter::ArkValue(arkColorArray); - - modifier_->setTrackShadow(node_, &initValueTrackShadow); + auto optValue = Converter::ArkValue(initValueTrackShadow); + modifier_->setTrackShadow(node_, &optValue); jsonValue = GetJsonValue(node_); jsonTrackShadow = GetAttrValue>(jsonValue, ATTRIBUTE_TRACK_SHADOW_NAME); diff --git a/test/unittest/capi/modifiers/date_picker_modifier_test.cpp b/test/unittest/capi/modifiers/date_picker_modifier_test.cpp index 23f6315e825..e5c457ba533 100644 --- a/test/unittest/capi/modifiers/date_picker_modifier_test.cpp +++ b/test/unittest/capi/modifiers/date_picker_modifier_test.cpp @@ -316,8 +316,8 @@ HWTEST_F(DatePickerModifierTest, setLunarTest, TestSize.Level1) EXPECT_EQ(initialValue, ATTRIBUTE_LUNAR_DEFAULT_VALUE); for (auto lunar : BOOL_TEST_PLAN) { - Ark_Boolean inputValue = Converter::ArkValue(lunar.first); - modifier_->setLunar0(node_, inputValue); + auto inputValue = Converter::ArkValue(lunar.first); + modifier_->setLunar0(node_, &inputValue); auto checkValue = GetAttrValue(node_, ATTRIBUTE_LUNAR_NAME); EXPECT_EQ(checkValue, lunar.second); } @@ -372,7 +372,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTexFontStyle, TestSize.Level1) for (auto style : FONT_STYLE_TEST_PLAN) { font.style = style.first; pickerStyle.font.value = font; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -412,7 +413,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -429,7 +431,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN2) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -469,7 +472,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTextFontFamily, TestSize.Level1) for (auto family : FONT_FAMILY_TEST_PLAN) { font.family = family.first; pickerStyle.font.value = font; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -509,7 +513,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTextFontSize, TestSize.Level1) for (auto size : FONT_SIZE_TEST_PLAN) { font.size = size.first; pickerStyle.font.value = font; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -540,7 +545,8 @@ HWTEST_F(DatePickerModifierTest, setDisappearTextColor, TestSize.Level1) for (const auto& [value, expectVal] : COLOR_TEST_PLAN) { pickerStyle.color = value; - modifier_->setDisappearTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setDisappearTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_DISAPPEAR_TEXT_STYLE_NAME); checkVal = GetAttrValue(styleObject, ATTRIBUTE_COLOR_NAME); @@ -597,7 +603,8 @@ HWTEST_F(DatePickerModifierTest, setTexFontStyle, TestSize.Level1) for (auto style : FONT_STYLE_TEST_PLAN) { font.style = style.first; pickerStyle.font.value = font; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -637,7 +644,8 @@ HWTEST_F(DatePickerModifierTest, setTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -654,7 +662,8 @@ HWTEST_F(DatePickerModifierTest, setTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN2) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -694,7 +703,8 @@ HWTEST_F(DatePickerModifierTest, setTextFontFamily, TestSize.Level1) for (auto family : FONT_FAMILY_TEST_PLAN) { font.family = family.first; pickerStyle.font.value = font; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -734,7 +744,8 @@ HWTEST_F(DatePickerModifierTest, setTextFontSize, TestSize.Level1) for (auto size : FONT_SIZE_TEST_PLAN) { font.size = size.first; pickerStyle.font.value = font; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -765,7 +776,8 @@ HWTEST_F(DatePickerModifierTest, setTextColor, TestSize.Level1) for (const auto& [value, expectVal] : COLOR_TEST_PLAN) { pickerStyle.color = value; - modifier_->setTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_TEXT_STYLE_NAME); checkVal = GetAttrValue(styleObject, ATTRIBUTE_COLOR_NAME); @@ -822,7 +834,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTexFontStyle, TestSize.Level1) for (auto style : FONT_STYLE_TEST_PLAN) { font.style = style.first; pickerStyle.font.value = font; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -862,7 +875,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -879,7 +893,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTexFontWeight, TestSize.Level1) for (auto weight : FONT_WEIGHT_TEST_PLAN2) { font.weight = weight.first; pickerStyle.font.value = font; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -919,7 +934,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTextFontFamily, TestSize.Level1) for (auto family : FONT_FAMILY_TEST_PLAN) { font.family = family.first; pickerStyle.font.value = font; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -959,7 +975,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTextFontSize, TestSize.Level1) for (auto size : FONT_SIZE_TEST_PLAN) { font.size = size.first; pickerStyle.font.value = font; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); auto fontObject = GetAttrValue(styleObject, ATTRIBUTE_FONT_NAME); @@ -990,7 +1007,8 @@ HWTEST_F(DatePickerModifierTest, setSelectedTextColor, TestSize.Level1) for (const auto& [value, expectVal] : COLOR_TEST_PLAN) { pickerStyle.color = value; - modifier_->setSelectedTextStyle0(node_, &pickerStyle); + auto optValue = Converter::ArkValue(pickerStyle); + modifier_->setSelectedTextStyle0(node_, &optValue); auto fullJson = GetJsonValue(node_); auto styleObject = GetAttrValue>(fullJson, ATTRIBUTE_SELECTED_TEXT_STYLE_NAME); checkVal = GetAttrValue(styleObject, ATTRIBUTE_COLOR_NAME); @@ -1033,7 +1051,8 @@ HWTEST_F(DatePickerModifierTest, setOnChangeTest, TestSize.Level1) }; }; auto arkCallback = Converter::ArkValue(onChange, frameNode->GetId()); - modifier_->setOnChange(node_, &arkCallback); + auto optCallback = Converter::ArkValue(arkCallback); + modifier_->setOnChange(node_, &optCallback); for (const auto& testValue : CHANGE_EVENT_TEST_PLAN) { DatePickerChangeEvent event(testValue.first.ToString(true)); @@ -1123,8 +1142,9 @@ HWTEST_F(DatePickerModifierTest, setOnDateChangeTest, TestSize.Level1) }, .call = onDateChange }; + auto optFunc = Converter::ArkValue(func); - modifier_->setOnDateChange0(node_, &func); + modifier_->setOnDateChange0(node_, &optFunc); for (const auto& testValue : CHANGE_EVENT_TEST_PLAN) { DatePickerChangeEvent event(testValue.first.ToString(true)); diff --git a/test/unittest/capi/modifiers/divider_modifier_test.cpp b/test/unittest/capi/modifiers/divider_modifier_test.cpp index b44364c4d55..f9d46a2f033 100644 --- a/test/unittest/capi/modifiers/divider_modifier_test.cpp +++ b/test/unittest/capi/modifiers/divider_modifier_test.cpp @@ -47,7 +47,7 @@ public: * @tc.desc: Check the functionality of DividerModifier.setColor * @tc.type: FUNC */ -HWTEST_F(DividerModifierTest, DISABLED_DividerModifierTest001, TestSize.Level1) +HWTEST_F(DividerModifierTest, DividerModifierTest001, TestSize.Level1) { static const std::string PROP_NAME("color"); ASSERT_NE(modifier_->setColor, nullptr); @@ -55,55 +55,65 @@ HWTEST_F(DividerModifierTest, DISABLED_DividerModifierTest001, TestSize.Level1) auto checkVal1 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal1, "#FF000000"); Ark_ResourceColor color = Converter::ArkUnion(ARK_COLOR_WHITE); - modifier_->setColor(node_, &color); + auto optValue = Converter::ArkValue(color); + modifier_->setColor(node_, &optValue); auto checkVal2 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal2, "#FFFFFFFF"); Ark_ResourceColor numberInt = { .selector = 1, .value1 = Converter::ArkValue(0x123456) }; - modifier_->setColor(node_, &numberInt); + optValue = Converter::ArkValue(numberInt); + modifier_->setColor(node_, &optValue); auto checkVal3 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal3, "#FF123456"); Ark_ResourceColor numberFlt = { .selector = 1, .value1 = Converter::ArkValue(0.5f) }; - modifier_->setColor(node_, &numberFlt); + optValue = Converter::ArkValue(numberFlt); + modifier_->setColor(node_, &optValue); auto checkVal4 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal4, "#00000000"); Ark_ResourceColor strColor = { .selector = 2, .value2 = Converter::ArkValue("#11223344") }; - modifier_->setColor(node_, &strColor); + optValue = Converter::ArkValue(strColor); + modifier_->setColor(node_, &optValue); auto checkVal5 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal5, "#11223344"); Ark_ResourceColor strNumber = { .selector = 2, .value2 = Converter::ArkValue("65535") }; - modifier_->setColor(node_, &strNumber); + optValue = Converter::ArkValue(strNumber); + modifier_->setColor(node_, &optValue); auto checkVal6 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal6, "#FF00FFFF"); auto resNameColor = CreateResourceUnion( NamedResourceId{"aa.bb.cc", Converter::ResourceType::COLOR}); - modifier_->setColor(node_, &resNameColor); + optValue = Converter::ArkValue(resNameColor); + modifier_->setColor(node_, &optValue); auto checkVal7 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal7, "#FFFF0000"); // Color::RED is result of mocked ThemeConstants::GetColorByName auto resIdColor = CreateResourceUnion(IntResourceId{1234, Converter::ResourceType::COLOR}); - modifier_->setColor(node_, &resIdColor); + optValue = Converter::ArkValue(resIdColor); + modifier_->setColor(node_, &optValue); auto checkVal8 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal8, "#FFFF0000"); // Color::RED is result of mocked ThemeConstants::GetColor(int) resNameColor = CreateResourceUnion( NamedResourceId{"incorrect_color", Converter::ResourceType::STRING}); - modifier_->setColor(node_, &resNameColor); + optValue = Converter::ArkValue(resNameColor); + modifier_->setColor(node_, &optValue); auto checkVal9 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal9, "#FF000000"); // Should be Color::RED, but converter from Resource works incorrect now. + EXPECT_EQ(checkVal9, "#FFFF0000"); // Should be Color::RED, but converter from Resource works incorrect now. // So modifier pass Color::BLACK to divider component int this case strNumber = { .selector = 2, .value2 = Converter::ArkValue("incorrect_color") }; - modifier_->setColor(node_, &strNumber); + optValue = Converter::ArkValue(strNumber); + modifier_->setColor(node_, &optValue); auto checkVal10 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal10, "#FF000000"); strNumber = { .selector = 2, .value2 = Converter::ArkValue("") }; - modifier_->setColor(node_, &strNumber); + optValue = Converter::ArkValue(strNumber); + modifier_->setColor(node_, &optValue); auto checkVal11 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal11, "#FF000000"); } @@ -121,27 +131,28 @@ HWTEST_F(DividerModifierTest, DividerModifierTest002, TestSize.Level1) auto checkVal1 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal1, "true"); - modifier_->setVertical(node_, false); + auto optValue = Converter::ArkValue(false); + modifier_->setVertical(node_, &optValue); auto checkVal2 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal2, "false"); - modifier_->setVertical(node_, true); + optValue = Converter::ArkValue(true); + modifier_->setVertical(node_, &optValue); auto checkVal3 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal3, "true"); - modifier_->setVertical(node_, 0); - auto checkVal4 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal4, "false"); - - modifier_->setVertical(node_, -25); + optValue = Converter::ArkValue(-25); + modifier_->setVertical(node_, &optValue); auto checkVal5 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal5, "true"); - modifier_->setVertical(node_, 0); + optValue = Converter::ArkValue(0); + modifier_->setVertical(node_, &optValue); auto checkVal6 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal6, "false"); - modifier_->setVertical(node_, 25); + optValue = Converter::ArkValue(25); + modifier_->setVertical(node_, &optValue); auto checkVal7 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal7, "true"); } @@ -151,27 +162,31 @@ HWTEST_F(DividerModifierTest, DividerModifierTest002, TestSize.Level1) * @tc.desc: Check the functionality of DividerModifier.setLineCap * @tc.type: FUNC */ -HWTEST_F(DividerModifierTest, DISABLED_DividerModifierTest003, TestSize.Level1) +HWTEST_F(DividerModifierTest, DividerModifierTest003, TestSize.Level1) { static const std::string PROP_NAME("lineCap"); - ASSERT_NE(modifier_->setVertical, nullptr); + ASSERT_NE(modifier_->setLineCap, nullptr); auto checkVal1 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal1, LINE_CUP_BUTT); - modifier_->setLineCap(node_, ARK_LINE_CAP_STYLE_SQUARE); + auto optValue = Converter::ArkValue(ARK_LINE_CAP_STYLE_SQUARE); + modifier_->setLineCap(node_, &optValue); auto checkVal2 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal2, LINE_CUP_SQUARE); - modifier_->setLineCap(node_, ARK_LINE_CAP_STYLE_BUTT); + optValue = Converter::ArkValue(ARK_LINE_CAP_STYLE_BUTT); + modifier_->setLineCap(node_, &optValue); auto checkVal3 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal3, LINE_CUP_BUTT); - modifier_->setLineCap(node_, ARK_LINE_CAP_STYLE_ROUND); + optValue = Converter::ArkValue(ARK_LINE_CAP_STYLE_ROUND); + modifier_->setLineCap(node_, &optValue); auto checkVal4 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal4, LINE_CUP_ROUND); - modifier_->setLineCap(node_, static_cast(-25)); + optValue = Converter::ArkValue(static_cast(-25)); + modifier_->setLineCap(node_, &optValue); auto checkVal5 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal5, LINE_CUP_BUTT); } @@ -190,27 +205,32 @@ HWTEST_F(DividerModifierTest, DividerModifierTest004, TestSize.Level1) EXPECT_EQ(checkVal1, DEFAULT_STROKE_WIDTH); Ark_Union_Number_String intVal = { .selector = 0, .value0 = Converter::ArkValue(123) }; - modifier_->setStrokeWidth(node_, &intVal); + auto optValue = Converter::ArkValue(intVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal2 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal2, "123.00vp"); Ark_Union_Number_String floatVal = { .selector = 0, .value0 = Converter::ArkValue(1.23f) }; - modifier_->setStrokeWidth(node_, &floatVal); + optValue = Converter::ArkValue(floatVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal3 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal3, "1.23vp"); Ark_Union_Number_String pxVal = { .selector = 1, .value1 = Converter::ArkValue("45px") }; - modifier_->setStrokeWidth(node_, &pxVal); + optValue = Converter::ArkValue(pxVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal4 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal4, "45.00px"); Ark_Union_Number_String vpVal = { .selector = 1, .value1 = Converter::ArkValue("5.6vp") }; - modifier_->setStrokeWidth(node_, &vpVal); + optValue = Converter::ArkValue(vpVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal5 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal5, "5.60vp"); Ark_Union_Number_String percentVal = { .selector = 1, .value1 = Converter::ArkValue("10%") }; - modifier_->setStrokeWidth(node_, &percentVal); + optValue = Converter::ArkValue(percentVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal6 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal6, DEFAULT_STROKE_WIDTH); } @@ -229,47 +249,56 @@ HWTEST_F(DividerModifierTest, DividerModifierTest005, TestSize.Level1) EXPECT_EQ(checkVal1, DEFAULT_STROKE_WIDTH); Ark_Union_Number_String intNegVal = { .selector = 0, .value0 = Converter::ArkValue(-123) }; - modifier_->setStrokeWidth(node_, &intNegVal); + auto optValue = Converter::ArkValue(intNegVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal2 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal2, "-123.00vp"); Ark_Union_Number_String floatNegVal = { .selector = 0, .value0 = Converter::ArkValue(-1.23f) }; - modifier_->setStrokeWidth(node_, &floatNegVal); + optValue = Converter::ArkValue(floatNegVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal3 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal3, "-1.23vp"); Ark_Union_Number_String pxNegVal = { .selector = 1, .value1 = Converter::ArkValue("-4.5px") }; - modifier_->setStrokeWidth(node_, &pxNegVal); + optValue = Converter::ArkValue(pxNegVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal4 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal4, "-4.50px"); Ark_Union_Number_String vpNegVal = { .selector = 1, .value1 = Converter::ArkValue("-56vp") }; - modifier_->setStrokeWidth(node_, &vpNegVal); + optValue = Converter::ArkValue(vpNegVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal5 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal5, "-56.00vp"); Ark_Union_Number_String undefVal = { .selector = 1, .value1 = Converter::ArkValue("undefVal") }; - modifier_->setStrokeWidth(node_, &undefVal); + optValue = Converter::ArkValue(undefVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal6 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal6, "0.00fp"); Ark_Union_Number_String percentNegVal = { .selector = 1, .value1 = Converter::ArkValue("-10%") }; - modifier_->setStrokeWidth(node_, &percentNegVal); + optValue = Converter::ArkValue(percentNegVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal7 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal7, DEFAULT_STROKE_WIDTH); Ark_Union_Number_String emptyVal = { .selector = 1, .value1 = Converter::ArkValue("") }; - modifier_->setStrokeWidth(node_, &emptyVal); + optValue = Converter::ArkValue(emptyVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal8 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal8, "0.00fp"); Ark_Union_Number_String invalidVal = { .selector = 1, .value1 = Converter::ArkValue("qw111vp") }; - modifier_->setStrokeWidth(node_, &invalidVal); + optValue = Converter::ArkValue(invalidVal); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal9 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal9, "0.00vp"); Ark_Union_Number_String invalidVal2 = { .selector = 1, .value1 = Converter::ArkValue("qw111") }; - modifier_->setStrokeWidth(node_, &invalidVal2); + optValue = Converter::ArkValue(invalidVal2); + modifier_->setStrokeWidth(node_, &optValue); auto checkVal10 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal10, "0.00fp"); } diff --git a/test/unittest/capi/modifiers/flex_modifier_test.cpp b/test/unittest/capi/modifiers/flex_modifier_test.cpp index 89e3a71aa09..5fbe52f353c 100755 --- a/test/unittest/capi/modifiers/flex_modifier_test.cpp +++ b/test/unittest/capi/modifiers/flex_modifier_test.cpp @@ -269,7 +269,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourcePositionXValidV Ark_PointLightStyle inputValuePointLight = initValuePointLight; WriteTo(inputValuePointLight.lightSource).positionX = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultLightSource = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_I_LIGHT_SOURCE_I_POSITION_NAME); @@ -312,7 +313,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourcePositionYValidV Ark_PointLightStyle inputValuePointLight = initValuePointLight; WriteTo(inputValuePointLight.lightSource).positionY = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultLightSource = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_I_LIGHT_SOURCE_I_POSITION_NAME); @@ -355,7 +357,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourcePositionZValidV Ark_PointLightStyle inputValuePointLight = initValuePointLight; WriteTo(inputValuePointLight.lightSource).positionZ = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultLightSource = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_I_LIGHT_SOURCE_I_POSITION_NAME); @@ -398,7 +401,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourceIntensity, Test Ark_PointLightStyle inputValuePointLight = initValuePointLight; WriteTo(inputValuePointLight.lightSource).intensity = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultLightSource = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); @@ -446,7 +450,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourceColorValidValue Ark_PointLightStyle inputValuePointLight = initValuePointLight; WriteTo(inputValuePointLight.lightSource).color = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); @@ -497,10 +502,11 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightLightSourceColorInvalidVal auto checkValue = [this, &initValuePointLight](const std::string& input, const Opt_ResourceColor& value) { Ark_PointLightStyle inputValuePointLight = initValuePointLight; - - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); WriteTo(inputValuePointLight.lightSource).color = value; - modifier_->setPointLight(node_, &inputValuePointLight); + optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); @@ -549,7 +555,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightIlluminatedValidValues, Te Ark_PointLightStyle inputValuePointLight = initValuePointLight; inputValuePointLight.illuminated = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); auto resultStr = GetAttrValue(resultPointLight, ATTRIBUTE_POINT_LIGHT_I_ILLUMINATED_NAME); @@ -588,7 +595,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightIlluminatedInvalidValues, auto checkValue = [this, &initValuePointLight](const std::string& input, const Opt_IlluminatedType& value) { Ark_PointLightStyle inputValuePointLight = initValuePointLight; inputValuePointLight.illuminated = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); auto resultStr = GetAttrValue(resultPointLight, ATTRIBUTE_POINT_LIGHT_I_ILLUMINATED_NAME); @@ -629,7 +637,8 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightBloomValidValues, TestSize Ark_PointLightStyle inputValuePointLight = initValuePointLight; inputValuePointLight.bloom = value; - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); @@ -672,10 +681,11 @@ HWTEST_F(FlexModifierTest, setPointLightTestPointLightBloomInvalidValues, TestSi auto checkValue = [this, &initValuePointLight](const std::string& input, const Opt_Number& value) { Ark_PointLightStyle inputValuePointLight = initValuePointLight; - - modifier_->setPointLight(node_, &inputValuePointLight); + auto optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); inputValuePointLight.bloom = value; - modifier_->setPointLight(node_, &inputValuePointLight); + optValue = Converter::ArkValue(inputValuePointLight); + modifier_->setPointLight(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultPointLight = GetAttrValue>(jsonValue, ATTRIBUTE_POINT_LIGHT_NAME); diff --git a/test/unittest/capi/modifiers/folder_stack_modifier_test.cpp b/test/unittest/capi/modifiers/folder_stack_modifier_test.cpp index a71e30b6799..b73445e92d1 100644 --- a/test/unittest/capi/modifiers/folder_stack_modifier_test.cpp +++ b/test/unittest/capi/modifiers/folder_stack_modifier_test.cpp @@ -103,7 +103,8 @@ HWTEST_F(FolderStackModifierTest, setAlignContentTestValidValues, TestSize.Level inputValueAlignContent = initValueAlignContent; for (auto&& value: alignContentAlignContentValidValues) { inputValueAlignContent = std::get<1>(value); - modifier_->setAlignContent(node_, inputValueAlignContent); + auto optValue = Converter::ArkValue(inputValueAlignContent); + modifier_->setAlignContent(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_ALIGN_CONTENT_NAME); expectedStr = std::get<2>(value); @@ -135,9 +136,11 @@ HWTEST_F(FolderStackModifierTest, setAlignContentTestInvalidValues, TestSize.Lev // Verifying attribute's values inputValueAlignContent = initValueAlignContent; - modifier_->setAlignContent(node_, inputValueAlignContent); + auto optValue = Converter::ArkValue(inputValueAlignContent); + modifier_->setAlignContent(node_, &optValue); inputValueAlignContent = std::get<1>(alignContentAlignContentInvalidValue); - modifier_->setAlignContent(node_, inputValueAlignContent); + optValue = Converter::ArkValue(inputValueAlignContent); + modifier_->setAlignContent(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_ALIGN_CONTENT_NAME); expectedStr = ATTRIBUTE_ALIGN_CONTENT_DEFAULT_VALUE; @@ -163,7 +166,8 @@ HWTEST_F(FolderStackModifierTest, setOnFolderStateChangeTest, TestSize.Level1) ASSERT_NE(frameNode, nullptr); auto context = MockPipelineContext::GetCurrent(); frameNode->AttachToMainTree(true, Referenced::RawPtr(context)); - modifier_->setOnFolderStateChange(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnFolderStateChange(node_, &optFunc); auto folderStackNode = AceType::DynamicCast(frameNode); ASSERT_NE(folderStackNode, nullptr); @@ -194,7 +198,8 @@ HWTEST_F(FolderStackModifierTest, setOnHoverStatusChangeTest, TestSize.Level1) ASSERT_NE(frameNode, nullptr); auto context = MockPipelineContext::GetCurrent(); frameNode->AttachToMainTree(true, Referenced::RawPtr(context)); - modifier_->setOnHoverStatusChange(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnHoverStatusChange(node_, &optFunc); auto folderStackNode = AceType::DynamicCast(frameNode); ASSERT_NE(folderStackNode, nullptr); @@ -246,7 +251,8 @@ HWTEST_F(FolderStackModifierTest, setEnableAnimationTestValidValues, TestSize.Le inputValueEnableAnimation = initValueEnableAnimation; for (auto&& value: enableAnimationEnableAnimationValidValues) { inputValueEnableAnimation = std::get<1>(value); - modifier_->setEnableAnimation(node_, inputValueEnableAnimation); + auto optValue = Converter::ArkValue(inputValueEnableAnimation); + modifier_->setEnableAnimation(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_ENABLE_ANIMATION_NAME); expectedStr = std::get<2>(value); @@ -294,7 +300,8 @@ HWTEST_F(FolderStackModifierTest, setAutoHalfFoldTestValidValues, TestSize.Level inputValueAutoHalfFold = initValueAutoHalfFold; for (auto&& value: autoHalfFoldAutoHalfFoldValidValues) { inputValueAutoHalfFold = std::get<1>(value); - modifier_->setAutoHalfFold(node_, inputValueAutoHalfFold); + auto optValue = Converter::ArkValue(inputValueAutoHalfFold); + modifier_->setAutoHalfFold(node_, &optValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_AUTO_HALF_FOLD_NAME); expectedStr = std::get<2>(value); diff --git a/test/unittest/capi/modifiers/form_component_modifier_test.cpp b/test/unittest/capi/modifiers/form_component_modifier_test.cpp index 911fd75e5c9..f7137b666c1 100644 --- a/test/unittest/capi/modifiers/form_component_modifier_test.cpp +++ b/test/unittest/capi/modifiers/form_component_modifier_test.cpp @@ -182,7 +182,8 @@ HWTEST_F(FormComponentModifierTest, DISABLED_setSizeTestSizeWidthValidValues, Te const std::string& input, const Opt_Length& value, const std::string& expectedStr) { Ark_SizeOptions inputValueSize = initValueSize; inputValueSize.width = value; - modifier_->setSize(node_, &inputValueSize); + auto optValue = Converter::ArkValue(inputValueSize); + modifier_->setSize(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultSize = GetAttrValue>(resultConstructor, ATTRIBUTE_SIZE_NAME); @@ -210,7 +211,8 @@ HWTEST_F(FormComponentModifierTest, DISABLED_setSizeTestSizeHeightValidValues, T const std::string& input, const Opt_Length& value, const std::string& expectedStr) { Ark_SizeOptions inputValueSize = initValueSize; inputValueSize.height = value; - modifier_->setSize(node_, &inputValueSize); + auto optValue = Converter::ArkValue(inputValueSize); + modifier_->setSize(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultSize = GetAttrValue>(resultConstructor, ATTRIBUTE_SIZE_NAME); @@ -253,7 +255,8 @@ HWTEST_F(FormComponentModifierTest, setModuleNameTestModuleNameValidValues, Test const std::string& input, const Ark_String& value, const std::string& expectedStr) { Ark_String inputValueModuleName = initValueModuleName; inputValueModuleName = value; - modifier_->setModuleName(node_, &inputValueModuleName); + auto optValue = Converter::ArkValue(inputValueModuleName); + modifier_->setModuleName(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultStr = GetAttrValue(resultConstructor, ATTRIBUTE_MODULE_NAME_NAME); @@ -294,7 +297,8 @@ HWTEST_F(FormComponentModifierTest, setAllowUpdateTestAllowUpdateValidValues, Te const std::string& input, const Ark_Boolean& value, const std::string& expectedStr) { Ark_Boolean inputValueAllowUpdate = initValueAllowUpdate; inputValueAllowUpdate = value; - modifier_->setAllowUpdate(node_, inputValueAllowUpdate); + auto optValue = Converter::ArkValue(inputValueAllowUpdate); + modifier_->setAllowUpdate(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultStr = GetAttrValue(resultConstructor, ATTRIBUTE_ALLOW_UPDATE_NAME); @@ -335,8 +339,8 @@ HWTEST_F(FormComponentModifierTest, setDimensionTestDimensionValidValues, TestSi const std::string& input, const Ark_FormDimension& value, const std::string& expectedStr) { Ark_FormDimension inputValueDimension = initValueDimension; inputValueDimension = value; - - modifier_->setDimension(node_, inputValueDimension); + auto optValue = Converter::ArkValue(inputValueDimension); + modifier_->setDimension(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultStr = GetAttrValue(resultConstructor, ATTRIBUTE_DIMENSION_NAME); @@ -364,7 +368,8 @@ HWTEST_F(FormComponentModifierTest, setDimensionTestDimensionInvalidValues, Test Ark_FormDimension inputValueDimension = initValueDimension; inputValueDimension = value; - modifier_->setDimension(node_, inputValueDimension); + auto optValue = Converter::ArkValue(inputValueDimension); + modifier_->setDimension(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultConstructor = GetAttrValue>(jsonValue, ATTRIBUTE_CONSTRUCTOR_NAME); auto resultStr = GetAttrValue(resultConstructor, ATTRIBUTE_DIMENSION_NAME); @@ -405,8 +410,8 @@ HWTEST_F(FormComponentModifierTest, setVisibilityTestVisibilityValidValues, Test const std::string& input, const Ark_Visibility& value, const std::string& expectedStr) { Ark_Visibility inputValueVisibility = initValueVisibility; inputValueVisibility = value; - - modifier_->setVisibility(node_, inputValueVisibility); + auto optValue = Converter::ArkValue(inputValueVisibility); + modifier_->setVisibility(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultStr = GetAttrValue(jsonValue, ATTRIBUTE_VISIBILITY_NAME); EXPECT_EQ(resultStr, expectedStr) << @@ -433,7 +438,8 @@ HWTEST_F(FormComponentModifierTest, setVisibilityTestVisibilityInvalidValues, Te Ark_Visibility inputValueVisibility = initValueVisibility; inputValueVisibility = value; - modifier_->setVisibility(node_, inputValueVisibility); + auto optValue = Converter::ArkValue(inputValueVisibility); + modifier_->setVisibility(node_, &optValue); auto jsonValue = GetJsonValue(node_); auto resultStr = GetAttrValue(jsonValue, ATTRIBUTE_VISIBILITY_NAME); EXPECT_EQ(resultStr, ATTRIBUTE_VISIBILITY_DEFAULT_VALUE) << @@ -473,7 +479,8 @@ HWTEST_F(FormComponentModifierTest, setOnAcquiredTest, TestSize.Level1) }, .call = onAcquired }; - modifier_->setOnAcquired(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnAcquired(node_, &optFunc); for (const auto& [actual, expectedNum, expectedStr] : testFixtureFormOnAcquiredCallbackTestValues) { formInfo = std::nullopt; auto testValue = ToJson(actual); @@ -512,7 +519,8 @@ HWTEST_F(FormComponentModifierTest, setOnErrorTest, TestSize.Level1) }, .call = onError }; - modifier_->setOnError(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnError(node_, &optFunc); for (const auto& [code, msg, expected] : testFixtureFormOnErrorCallbackTestValues) { formInfo = std::nullopt; auto testValue = ToJson(code, msg); @@ -553,7 +561,8 @@ HWTEST_F(FormComponentModifierTest, setOnUninstallTest, TestSize.Level1) }, .call = onUninstall }; - modifier_->setOnUninstall(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnUninstall(node_, &optFunc); for (const auto& [actual, expectedNum, expectedStr] : testFixtureFormOnAcquiredCallbackTestValues) { formInfo = std::nullopt; auto testValue = ToJson(actual); @@ -592,7 +601,8 @@ HWTEST_F(FormComponentModifierTest, setOnLoadTest, TestSize.Level1) }, .call = onLoad }; - modifier_->setOnLoad(node_, &func); + auto optFunc = Converter::ArkValue(func); + modifier_->setOnLoad(node_, &optFunc); formInfo = std::nullopt; eventHub->FireOnLoad(FORM_EMPTY_STRING); EXPECT_TRUE(formInfo.has_value()); -- Gitee From 69e64621ed7d0df61a486e8fa5793a1bd40feda3 Mon Sep 17 00:00:00 2001 From: kovalevsergey Date: Thu, 15 May 2025 14:40:26 +0300 Subject: [PATCH 2/5] test restore Signed-off-by: kovalevsergey Change-Id: I280d0dd9663fad9668457e785a62a9bb5a8e2852 --- test/unittest/capi/modifiers/BUILD.gn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/unittest/capi/modifiers/BUILD.gn b/test/unittest/capi/modifiers/BUILD.gn index a747949efb3..120c94511d4 100644 --- a/test/unittest/capi/modifiers/BUILD.gn +++ b/test/unittest/capi/modifiers/BUILD.gn @@ -146,12 +146,12 @@ ace_unittest("capi_all_modifiers_test") { #"text_timer_modifier_test.cpp", #"time_picker_modifier_test.cpp", #"toggle_modifier_test.cpp", - "video_modifier_test.cpp", - "water_flow_modifier_test.cpp", - "web_modifier_test.cpp", - "web_modifier_test2.cpp", - "web_modifier_test3.cpp", - "windowscene_modifier_test.cpp", + #"video_modifier_test.cpp", + #"water_flow_modifier_test.cpp", + #"web_modifier_test.cpp", + #"web_modifier_test2.cpp", + #"web_modifier_test3.cpp", + #"windowscene_modifier_test.cpp", ] sources += [ "generated/test_fixtures.cpp", -- Gitee From eaf06c18b6ddc9da71a8096c05159127dfc59d2a Mon Sep 17 00:00:00 2001 From: kovalevsergey Date: Mon, 19 May 2025 14:30:05 +0300 Subject: [PATCH 3/5] test restore Signed-off-by: kovalevsergey Change-Id: Ia9208921e7aa7ef4be0b05183889d29501840168 --- ...n_shape_method_modifier_resources_test.cpp | 23 +- .../common_shape_method_modifier_test.cpp | 322 ++++++++++-------- .../capi/modifiers/counter_modifier_test.cpp | 46 +-- 3 files changed, 213 insertions(+), 178 deletions(-) diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp index 5ac9d7a72f4..4054aee3714 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp @@ -47,11 +47,13 @@ const auto RESOURCE_OPACITY_BY_NUMBER = 0.5f; const auto CHECK_RESOURCE_OPACITY_BY_STRING = "0.400000"; const auto CHECK_RESOURCE_OPACITY_BY_NUMBER = "0.500000"; -using OneUnionNumStrResStep = std::pair; +using OneUnionNumStrResStep = std::pair; static const std::vector UNION_NUM_STR_RES_RESOURECES_TEST_PLAN = { - { CreateResourceUnion(RES_NAME_ID), CHECK_RESOURCE_OPACITY_BY_STRING }, - { CreateResourceUnion(RES_INT_ID), CHECK_RESOURCE_OPACITY_BY_NUMBER }, + { Converter::ArkValue( + CreateResourceUnion(RES_NAME_ID)), CHECK_RESOURCE_OPACITY_BY_STRING }, + { Converter::ArkValue( + CreateResourceUnion(RES_INT_ID)), CHECK_RESOURCE_OPACITY_BY_NUMBER }, }; } // namespace; class CommonShapeMethodModifierResourcesTest : public ModifierTestBase jsonValue; double result; - typedef std::pair OneTestStep; + typedef std::pair OneTestStep; const std::vector testPlan = { - { Converter::ArkValue(FAKE_RES_ID), 0 } + { Converter::ArkValue(FAKE_RES_ID), 10 } }; for (const auto &[arkLength, expected]: testPlan) { - auto optLength = Converter::ArkValue(arkLength); - modifier_->setStrokeWidth(node_, &optLength); + modifier_->setStrokeWidth(node_, &arkLength); result = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); EXPECT_NEAR(result, expected, FLT_EPSILON); } @@ -106,8 +107,7 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setFillOpacityTestResources, Te { std::unique_ptr jsonValue; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setFillOpacity(node_, &optValue); + modifier_->setFillOpacity(node_, &value); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_FILL_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); @@ -123,8 +123,7 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setStrokeOpacityTestResources, { std::unique_ptr jsonValue; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setStrokeOpacity(node_, &optValue); + modifier_->setStrokeOpacity(node_, &value); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp index 8118359223e..ec5f539077f 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp @@ -44,8 +44,8 @@ const auto ATTRIBUTE_FILL_OPACITY_DEFAULT_VALUE = "1.000000"; const auto ATTRIBUTE_STROKE_WIDTH_DEFAULT_VALUE = 0.0f; // global types -using OneTestColorStep = std::pair; -using OneUnionNumStrResStep = std::pair; +using OneTestColorStep = std::pair; +using OneUnionNumStrResStep = std::pair; // global test plans const auto RES_NAME = NamedResourceId{"aa.bb.cc", Converter::ResourceType::COLOR}; @@ -53,13 +53,15 @@ const auto RES_ID = IntResourceId{11111, Converter::ResourceType::COLOR}; static const std::string EXPECTED_RESOURCE_COLOR = Color::RED.ToString(); // Color::RED is result of ThemeConstants::GetColorXxxx stubs static const std::vector TEST_COLOR_PLAN = { - { ArkUnion(ARK_COLOR_WHITE), "#FFFFFFFF" }, - { ArkUnion(0x123456), "#FF123456" }, - { ArkUnion(0.5f), "#00000000" }, - { ArkUnion("#11223344"), "#11223344" }, - { ArkUnion("65535"), "#FF00FFFF" }, - { CreateResourceUnion(RES_NAME), EXPECTED_RESOURCE_COLOR }, - { CreateResourceUnion(RES_ID), EXPECTED_RESOURCE_COLOR }, + { Converter::ArkValue(ArkUnion(ARK_COLOR_WHITE)), "#FFFFFFFF" }, + { Converter::ArkValue(ArkUnion(0x123456)), "#FF123456" }, + { Converter::ArkValue(ArkUnion(0.5f)), "#00000000" }, + { Converter::ArkValue(ArkUnion("#11223344")), "#11223344" }, + { Converter::ArkValue(ArkUnion("65535")), "#FF00FFFF" }, + { Converter::ArkValue(CreateResourceUnion(RES_NAME)), + EXPECTED_RESOURCE_COLOR }, + { Converter::ArkValue(CreateResourceUnion(RES_ID)), + EXPECTED_RESOURCE_COLOR }, }; } // namespace @@ -87,8 +89,7 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::BLACK.ToString()); for (const auto &[arkResColor, expected]: TEST_COLOR_PLAN) { - auto optResColor = Converter::ArkValue(arkResColor); - modifier_->setStroke(node_, &optResColor); + modifier_->setStroke(node_, &arkResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -108,8 +109,7 @@ HWTEST_F(CommonShapeMethodModifierTest, setFillTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::BLACK.ToString()); for (const auto &[arkResColor, expected]: TEST_COLOR_PLAN) { - auto optResColor = Converter::ArkValue(arkResColor); - modifier_->setFill(node_, &optResColor); + modifier_->setFill(node_, &arkResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -138,14 +138,13 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestValidValues, TestSiz { std::unique_ptr jsonValue; std::string resultStr; - Ark_LineCapStyle inputValueStrokeLineCap; - + // Initial setup - inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_BUTT; - auto optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); + auto inputValueStrokeLineCap = Converter::ArkValue(ARK_LINE_CAP_STYLE_BUTT); // Test - modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &inputValueStrokeLineCap); + // Initial verification jsonValue = GetJsonValue(node_); @@ -153,16 +152,14 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestValidValues, TestSiz EXPECT_EQ(resultStr, "LineCapStyle.Butt"); // Verifying attribute's other values - inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_ROUND; - optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); - modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); + inputValueStrokeLineCap = Converter::ArkValue(ARK_LINE_CAP_STYLE_ROUND); + modifier_->setStrokeLineCap(node_, &inputValueStrokeLineCap); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_CAP_NAME); EXPECT_EQ(resultStr, "LineCapStyle.Round"); - inputValueStrokeLineCap = ARK_LINE_CAP_STYLE_SQUARE; - optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); - modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); + inputValueStrokeLineCap = Converter::ArkValue(ARK_LINE_CAP_STYLE_SQUARE); + modifier_->setStrokeLineCap(node_, &inputValueStrokeLineCap); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_CAP_NAME); @@ -178,14 +175,12 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestInvalidValues, TestS { std::unique_ptr jsonValue; std::string resultStr; - Ark_LineCapStyle inputValueStrokeLineCap; // Initial setup - inputValueStrokeLineCap = static_cast(-1); - auto optInputValueStrokeLineCap = Converter::ArkValue(inputValueStrokeLineCap); + auto inputValueStrokeLineCap = Converter::ArkValue(static_cast(-1)); // Test - modifier_->setStrokeLineCap(node_, &optInputValueStrokeLineCap); + modifier_->setStrokeLineCap(node_, &inputValueStrokeLineCap); // Initial verification jsonValue = GetJsonValue(node_); @@ -216,14 +211,12 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestValidValues, TestSi { std::unique_ptr jsonValue; std::string resultStr; - Ark_LineJoinStyle inputValueStrokeLineJoin; // Initial setup - inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_MITER; - auto optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); + auto inputValueStrokeLineJoin = Converter::ArkValue(ARK_LINE_JOIN_STYLE_MITER); // Test - modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &inputValueStrokeLineJoin); // Initial verification jsonValue = GetJsonValue(node_); @@ -231,16 +224,14 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestValidValues, TestSi EXPECT_EQ(resultStr, "LineJoinStyle.Miter"); // Verifying attribute's other values - inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_ROUND; - optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); - modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); + inputValueStrokeLineJoin = Converter::ArkValue(ARK_LINE_JOIN_STYLE_ROUND); + modifier_->setStrokeLineJoin(node_, &inputValueStrokeLineJoin); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_JOIN_NAME); EXPECT_EQ(resultStr, "LineJoinStyle.Round"); - inputValueStrokeLineJoin = ARK_LINE_JOIN_STYLE_BEVEL; - optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); - modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); + inputValueStrokeLineJoin = Converter::ArkValue(ARK_LINE_JOIN_STYLE_BEVEL); + modifier_->setStrokeLineJoin(node_, &inputValueStrokeLineJoin); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_LINE_JOIN_NAME); EXPECT_EQ(resultStr, "LineJoinStyle.Bevel"); @@ -255,14 +246,12 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineJoinTestInvalidValues, Test { std::unique_ptr jsonValue; std::string resultStr; - Ark_LineJoinStyle inputValueStrokeLineJoin; // Initial setup - inputValueStrokeLineJoin = static_cast(-1); - auto optInputValueStrokeLineJoin = Converter::ArkValue(inputValueStrokeLineJoin); + auto inputValueStrokeLineJoin = Converter::ArkValue(static_cast(-1)); // Test - modifier_->setStrokeLineJoin(node_, &optInputValueStrokeLineJoin); + modifier_->setStrokeLineJoin(node_, &inputValueStrokeLineJoin); // Initial verification jsonValue = GetJsonValue(node_); @@ -290,25 +279,38 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeOpacityTestDefault, TestSize.Le HWTEST_F(CommonShapeMethodModifierTest, setStrokeOpacityTest, TestSize.Level1) { static const std::vector UNION_NUM_STR_RES_TEST_PLAN = { - { ArkUnion(ArkValue(123)), "1.000000" }, - { ArkUnion(ArkValue(-123)), "0.000000" }, - { ArkUnion(ArkValue("5.6vp")), "1.000000" }, - { ArkUnion(ArkValue("-5.6vp")), "1.000000" }, - { ArkUnion(ArkValue("45px")), "1.000000" }, - { ArkUnion(ArkValue("-45px")), "1.000000" }, - { ArkUnion(ArkValue(0.23f)), "0.230000" }, - { ArkUnion(ArkValue(-0.23f)), "0.000000" }, - { ArkUnion(ArkValue("10%")), "0.100000" }, - { ArkUnion(ArkValue("45dp")), "1.000000" }, - { ArkUnion(ArkValue("undefVal")), "1.000000" }, - { ArkUnion(ArkValue("")), "1.000000" }, - { ArkUnion(ArkValue("qw111vp")), "1.000000" }, - { ArkUnion(ArkValue("qw111")), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(123))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(-123))), "0.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("5.6vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("-5.6vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("45px"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("-45px"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(0.23f))), "0.230000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(-0.23f))), "0.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("10%"))), "0.100000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("45dp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("undefVal"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(""))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("qw111vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("qw111"))), "1.000000" }, }; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setStrokeOpacity(node_, &optValue); + modifier_->setStrokeOpacity(node_, &value); auto checkVal = GetStringAttribute(node_, ATTRIBUTE_STROKE_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); } @@ -334,25 +336,38 @@ HWTEST_F(CommonShapeMethodModifierTest, setFillOpacityTestDefault, TestSize.Leve HWTEST_F(CommonShapeMethodModifierTest, setFillOpacityTest, TestSize.Level1) { static const std::vector UNION_NUM_STR_RES_TEST_PLAN = { - { ArkUnion(ArkValue(123)), "1.000000" }, - { ArkUnion(ArkValue(-123)), "0.000000" }, - { ArkUnion(ArkValue("5.6vp")), "1.000000" }, - { ArkUnion(ArkValue("-5.6vp")), "1.000000" }, - { ArkUnion(ArkValue("45px")), "1.000000" }, - { ArkUnion(ArkValue("-45px")), "1.000000" }, - { ArkUnion(ArkValue(0.23f)), "0.230000" }, - { ArkUnion(ArkValue(-0.23f)), "0.000000" }, - { ArkUnion(ArkValue("10%")), "0.100000" }, - { ArkUnion(ArkValue("45dp")), "1.000000" }, - { ArkUnion(ArkValue("undefVal")), "1.000000" }, - { ArkUnion(ArkValue("")), "1.000000" }, - { ArkUnion(ArkValue("qw111vp")), "1.000000" }, - { ArkUnion(ArkValue("qw111")), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(123))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(-123))), "0.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("5.6vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("-5.6vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("45px"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("-45px"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(0.23f))), "0.230000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(-0.23f))), "0.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("10%"))), "0.100000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("45dp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("undefVal"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue(""))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("qw111vp"))), "1.000000" }, + { Converter::ArkValue( + ArkUnion(ArkValue("qw111"))), "1.000000" }, }; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setFillOpacity(node_, &optValue); + modifier_->setFillOpacity(node_, &value); auto checkVal = GetStringAttribute(node_, ATTRIBUTE_FILL_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); } @@ -382,24 +397,23 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeWidthTestValidValues, TestSize. std::unique_ptr jsonValue; double result; - typedef std::pair OneTestStep; + typedef std::pair OneTestStep; static const std::vector testPlan = { - { ArkValue(1.0f), 1.0f }, - { ArkValue(2.45f), 2.45f }, - { ArkValue(5.0_px), 5.0f }, - { ArkValue(22.35_px), 22.35f }, - { ArkValue("23.00%"), 0.0f }, - { ArkValue(7.0_vp), 7.0f }, - { ArkValue(1.65_vp), 1.65f }, - { ArkValue(-0.1f), 0.0f }, - { ArkValue(65.0_fp), 65.0f }, - { ArkValue(4.3_fp), 4.30f }, - { ArkValue(-5.0_px), 0.0f }, + { ArkValue(1.0f), 1.0f }, + { ArkValue(2.45f), 2.45f }, + { ArkValue(5.0_px), 5.0f }, + { ArkValue(22.35_px), 22.35f }, + { ArkValue("23.00%"), 0.0f }, + { ArkValue(7.0_vp), 7.0f }, + { ArkValue(1.65_vp), 1.65f }, + { ArkValue(-0.1f), 0.0f }, + { ArkValue(65.0_fp), 65.0f }, + { ArkValue(4.3_fp), 4.30f }, + { ArkValue(-5.0_px), 0.0f }, }; for (const auto &[arkLength, expected]: testPlan) { - auto optLength = Converter::ArkValue(arkLength); - modifier_->setStrokeWidth(node_, &optLength); + modifier_->setStrokeWidth(node_, &arkLength); jsonValue = GetJsonValue(node_); result = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); EXPECT_NEAR(result, expected, FLT_EPSILON); @@ -428,32 +442,43 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashOffsetTestDefault, TestSize */ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashOffsetTest, TestSize.Level1) { - using OneTestStep = std::pair; + using OneTestStep = std::pair; static const std::vector testPlan = { - { ArkUnion(1), "1.00vp" }, - { ArkUnion(0), "0.00px" }, - { ArkUnion(2.45f), "2.45vp" }, - { ArkUnion(-2.45f), "0.00px" }, - { ArkUnion("5px"), "5.00px" }, - { ArkUnion("22.35px"), "22.35px" }, - { ArkUnion("7vp"), "7.00vp" }, - { ArkUnion("1.65vp"), "1.65vp" }, - { ArkUnion("65fp"), "65.00fp" }, - { ArkUnion("4.3fp"), "4.30fp" }, - { ArkUnion("11lpx"), "11.00lpx" }, - { ArkUnion("0.5lpx"), "0.50lpx" }, - { ArkUnion("3"), "3.00fp" }, - { ArkUnion(""), "0.00px" }, - { ArkUnion("10.65"), "10.65fp" }, - { ArkUnion("23%"), "0.00px" }, + { Converter::ArkValue(ArkUnion(1)), "1.00vp" }, + { Converter::ArkValue(ArkUnion(0)), "0.00px" }, + { Converter::ArkValue(ArkUnion(2.45f)), + "2.45vp" }, + { Converter::ArkValue(ArkUnion(-2.45f)), + "0.00px" }, + { Converter::ArkValue(ArkUnion("5px")), + "5.00px" }, + { Converter::ArkValue(ArkUnion("22.35px")), + "22.35px" }, + { Converter::ArkValue(ArkUnion("7vp")), + "7.00vp" }, + { Converter::ArkValue(ArkUnion("1.65vp")), + "1.65vp" }, + { Converter::ArkValue(ArkUnion("65fp")), + "65.00fp" }, + { Converter::ArkValue(ArkUnion("4.3fp")), + "4.30fp" }, + { Converter::ArkValue(ArkUnion("11lpx")), + "11.00lpx" }, + { Converter::ArkValue(ArkUnion("0.5lpx")), + "0.50lpx" }, + { Converter::ArkValue(ArkUnion("3")), "3.00fp" }, + { Converter::ArkValue(ArkUnion("")), "0.00px" }, + { Converter::ArkValue(ArkUnion("10.65")), + "10.65fp" }, + { Converter::ArkValue(ArkUnion("23%")), + "0.00px" }, }; std::unique_ptr jsonValue; std::string resultStr; for (const auto &[arkValue, expected]: testPlan) { - auto optValue = Converter::ArkValue(arkValue); - modifier_->setStrokeDashOffset(node_, &optValue); + modifier_->setStrokeDashOffset(node_, &arkValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_DASH_OFFSET_NAME); @@ -483,32 +508,45 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeMiterLimitTestDefaultValue, Tes */ HWTEST_F(CommonShapeMethodModifierTest, setStrokeMiterLimitTest, TestSize.Level1) { - using OneTestStep = std::pair; + using OneTestStep = std::pair; static const std::vector testPlan = { - { ArkUnion(1), "1.000000" }, - { ArkUnion(0), "1.000000" }, - { ArkUnion(2.45f), "2.450000" }, - { ArkUnion("5px"), "4.000000" }, - { ArkUnion("22.35px"), "4.000000" }, - { ArkUnion("7vp"), "4.000000" }, - { ArkUnion("1.65vp"), "4.000000" }, - { ArkUnion("65fp"), "4.000000" }, - { ArkUnion("4.3fp"), "4.000000" }, - { ArkUnion("11lpx"), "4.000000" }, - { ArkUnion("0.5lpx"), "4.000000" }, - { ArkUnion("3"), "3.000000" }, - { ArkUnion("-3"), "1.000000" }, - { ArkUnion(""), "4.000000" }, - { ArkUnion("10.65"), "10.650000" }, - { ArkUnion("23%"), "1.000000" }, + { Converter::ArkValue(ArkUnion(1)), "1.000000" }, + { Converter::ArkValue(ArkUnion(0)), "1.000000" }, + { Converter::ArkValue(ArkUnion(2.45f)), + "2.450000" }, + { Converter::ArkValue(ArkUnion("5px")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("22.35px")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("7vp")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("1.65vp")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("65fp")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("4.3fp")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("11lpx")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("0.5lpx")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("3")), + "3.000000" }, + { Converter::ArkValue(ArkUnion("-3")), + "1.000000" }, + { Converter::ArkValue(ArkUnion("")), + "4.000000" }, + { Converter::ArkValue(ArkUnion("10.65")), + "10.650000" }, + { Converter::ArkValue(ArkUnion("23%")), + "1.000000" }, }; std::unique_ptr jsonValue; std::string resultStr; for (const auto &[arkValue, expected]: testPlan) { - auto optValue = Converter::ArkValue(arkValue); - modifier_->setStrokeMiterLimit(node_, &optValue); + modifier_->setStrokeMiterLimit(node_, &arkValue); jsonValue = GetJsonValue(node_); resultStr = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_MITER_LIMIT_NAME); @@ -525,23 +563,22 @@ HWTEST_F(CommonShapeMethodModifierTest, setAntiAliasTest, TestSize.Level1) { static const std::string PROP_NAME("antiAlias"); ASSERT_NE(modifier_->setAntiAlias, nullptr); - using OneBoolStep = std::tuple; + using OneBoolStep = std::tuple; const std::vector BOOL_TEST_PLAN = { - { false, "false" }, - { true, "true" }, - { 0, "false" }, - { -25, "true" }, - { 0, "false" }, - { 25, "true" }, - { false, "false" } + { Converter::ArkValue(false), "false" }, + { Converter::ArkValue(true), "true" }, + { Converter::ArkValue(0), "false" }, + { Converter::ArkValue(-25), "true" }, + { Converter::ArkValue(0), "false" }, + { Converter::ArkValue(25), "true" }, + { Converter::ArkValue(false), "false" } }; auto fullJson = GetJsonValue(node_); auto checkVal = GetAttrValue(fullJson, PROP_NAME); EXPECT_EQ(checkVal, "true"); for (const auto& [value, expectVal] : BOOL_TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setAntiAlias(node_, &optValue); + modifier_->setAntiAlias(node_, &value); auto fullJson = GetJsonValue(node_); checkVal = GetAttrValue(fullJson, PROP_NAME); EXPECT_EQ(checkVal, expectVal); @@ -557,16 +594,16 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashArrayTest, TestSize.Level1) { static const std::string propName("strokeDashArray"); ASSERT_NE(modifier_->setStrokeDashArray, nullptr); - using OneArrayLengthStep = std::tuple>; + using OneArrayLengthStep = std::tuple>; std::vector vec1 = {3._px, 6._px}; std::vector vec2 = {5.4f}; std::vector vec3 = {8.43_vp}; std::vector vec4 = {0.1_pct, 0.55_pct}; const std::vector TEST_PLAN = { - { Converter::ArkValue(vec1, Converter::FC), {"3.00px", "6.00px"} }, - { Converter::ArkValue(vec2, Converter::FC), {"5.40vp", "5.40vp"} }, - { Converter::ArkValue(vec3, Converter::FC), {"8.43vp", "8.43vp"} }, - { Converter::ArkValue(vec4, Converter::FC), {"10.00%", "55.00%"} }, + { Converter::ArkValue(vec1, Converter::FC), {"3.00px", "6.00px"} }, + { Converter::ArkValue(vec2, Converter::FC), {"5.40vp", "5.40vp"} }, + { Converter::ArkValue(vec3, Converter::FC), {"8.43vp", "8.43vp"} }, + { Converter::ArkValue(vec4, Converter::FC), {"10.00%", "55.00%"} }, }; auto fullJson = GetJsonValue(node_); auto checkVal = GetAttrValue>(fullJson, propName); @@ -574,8 +611,7 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashArrayTest, TestSize.Level1) EXPECT_EQ(checkVal->GetArraySize(), 0); for (const auto& [value, expectVal] : TEST_PLAN) { - auto optValue = Converter::ArkValue(value); - modifier_->setStrokeDashArray(node_, &optValue); + modifier_->setStrokeDashArray(node_, &value); auto fullJson = GetJsonValue(node_); checkVal = GetAttrValue>(fullJson, propName); ASSERT_TRUE(checkVal->IsArray()); diff --git a/test/unittest/capi/modifiers/counter_modifier_test.cpp b/test/unittest/capi/modifiers/counter_modifier_test.cpp index 3d5f3488560..bf7d0c48821 100644 --- a/test/unittest/capi/modifiers/counter_modifier_test.cpp +++ b/test/unittest/capi/modifiers/counter_modifier_test.cpp @@ -203,20 +203,23 @@ HWTEST_F(CounterModifierTest, setOnDecTest, TestSize.Level1) */ HWTEST_F(CounterModifierTest, setBackgroundColorTest, TestSize.Level1) { - using OneTestStep = std::pair; + using OneTestStep = std::pair; static const std::string PROP_NAME("backgroundColor"); static auto resName = NamedResourceId("aa.bb.cc", Converter::ResourceType::COLOR); static auto resId = IntResourceId(1234, Converter::ResourceType::COLOR); static const std::string EXPECTED_RESOURCE_COLOR = Color::RED.ToString(); // Color::RED is result of ThemeConstants::GetColorXxxx stubs static const std::vector testPlan = { - { ArkUnion(ARK_COLOR_WHITE), "#FFFFFFFF" }, - { ArkUnion(0x123456), "#FF123456" }, - { ArkUnion(0.5f), "#00000000" }, - { ArkUnion("#11223344"), "#11223344" }, - { ArkUnion("65535"), "#FF00FFFF" }, - { CreateResourceUnion(resName), EXPECTED_RESOURCE_COLOR }, - { CreateResourceUnion(resId), EXPECTED_RESOURCE_COLOR }, + { Converter::ArkValue(ArkUnion(ARK_COLOR_WHITE)), + "#FFFFFFFF" }, + { Converter::ArkValue(ArkUnion(0x123456)), "#FF123456" }, + { Converter::ArkValue(ArkUnion(0.5f)), "#00000000" }, + { Converter::ArkValue(ArkUnion("#11223344")), "#11223344" }, + { Converter::ArkValue(ArkUnion("65535")), "#FF00FFFF" }, + { Converter::ArkValue(CreateResourceUnion(resName)), + EXPECTED_RESOURCE_COLOR }, + { Converter::ArkValue(CreateResourceUnion(resId)), + EXPECTED_RESOURCE_COLOR }, }; ASSERT_NE(commonModifier_->setBackgroundColor0, nullptr); @@ -225,8 +228,7 @@ HWTEST_F(CounterModifierTest, setBackgroundColorTest, TestSize.Level1) EXPECT_EQ(checkInitial, Color::TRANSPARENT.ToString()); for (const auto &[arkResColor, expected]: testPlan) { - auto optResColor = Converter::ArkValue(arkResColor); - commonModifier_->setBackgroundColor0(node_, &optResColor); + commonModifier_->setBackgroundColor0(node_, &arkResColor); auto checkColor = GetAttrValue(node_, PROP_NAME); EXPECT_EQ(checkColor, expected); } @@ -264,9 +266,8 @@ HWTEST_F(CounterModifierTest, setWidth0TestValidValues, TestSize.Level1) }; for (const auto &[arkLength, expected]: testPlan) { - Ark_Length inputValue = Converter::ArkValue(arkLength); - auto optValue = Converter::ArkValue(inputValue); - commonModifier_->setWidth0(node_, &optValue); + auto inputValue = Converter::ArkValue(arkLength); + commonModifier_->setWidth0(node_, &inputValue); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, expected); } @@ -279,19 +280,18 @@ HWTEST_F(CounterModifierTest, setWidth0TestValidValues, TestSize.Level1) */ HWTEST_F(CounterModifierTest, DISABLED_setWidth0TestInvalidValues, TestSize.Level1) { - static const std::vector testPlan = { - Converter::ArkValue(-2.45f), - Converter::ArkValue(-5.0_px), - Converter::ArkValue(-22.35_px), - Converter::ArkValue(-7.0_vp), - Converter::ArkValue(-1.65_vp), - Converter::ArkValue(-65.0_fp), - Converter::ArkValue(-4.3_fp), + static const std::vector testPlan = { + Converter::ArkValue(-2.45f), + Converter::ArkValue(-5.0_px), + Converter::ArkValue(-22.35_px), + Converter::ArkValue(-7.0_vp), + Converter::ArkValue(-1.65_vp), + Converter::ArkValue(-65.0_fp), + Converter::ArkValue(-4.3_fp), }; for (const auto &arkLength : testPlan) { - auto inputValue = Converter::ArkValue(arkLength); - commonModifier_->setWidth0(node_, &inputValue); + commonModifier_->setWidth0(node_, &arkLength); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, ATTRIBUTE_WIDTH_DEFAULT_VALUE); } -- Gitee From 50312fe3faa0303b77f4ede68c54c7a46b390fb0 Mon Sep 17 00:00:00 2001 From: kovalevsergey Date: Mon, 19 May 2025 17:01:31 +0300 Subject: [PATCH 4/5] test restore Signed-off-by: kovalevsergey Change-Id: I97e4fb409099dac898327b10df99cbdbba57e97e --- ...n_shape_method_modifier_resources_test.cpp | 16 +- .../common_shape_method_modifier_test.cpp | 6 +- .../capi/modifiers/counter_modifier_test.cpp | 66 ++++---- .../capi/modifiers/divider_modifier_test.cpp | 155 ++++++------------ 4 files changed, 91 insertions(+), 152 deletions(-) diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp index 4054aee3714..b583ecfdd3b 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp @@ -47,13 +47,11 @@ const auto RESOURCE_OPACITY_BY_NUMBER = 0.5f; const auto CHECK_RESOURCE_OPACITY_BY_STRING = "0.400000"; const auto CHECK_RESOURCE_OPACITY_BY_NUMBER = "0.500000"; -using OneUnionNumStrResStep = std::pair; +using OneUnionNumStrResStep = std::pair; static const std::vector UNION_NUM_STR_RES_RESOURECES_TEST_PLAN = { - { Converter::ArkValue( - CreateResourceUnion(RES_NAME_ID)), CHECK_RESOURCE_OPACITY_BY_STRING }, - { Converter::ArkValue( - CreateResourceUnion(RES_INT_ID)), CHECK_RESOURCE_OPACITY_BY_NUMBER }, + { CreateResourceUnion(RES_NAME_ID), CHECK_RESOURCE_OPACITY_BY_STRING }, + { CreateResourceUnion(RES_INT_ID), CHECK_RESOURCE_OPACITY_BY_NUMBER }, }; } // namespace; class CommonShapeMethodModifierResourcesTest : public ModifierTestBase jsonValue; + Opt_Union_Number_String_Resource res; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - modifier_->setFillOpacity(node_, &value); + res = Converter::ArkValue(value); + modifier_->setFillOpacity(node_, &res); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_FILL_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); @@ -122,8 +122,10 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, setFillOpacityTestResources, Te HWTEST_F(CommonShapeMethodModifierResourcesTest, setStrokeOpacityTestResources, TestSize.Level1) { std::unique_ptr jsonValue; + Opt_Union_Number_String_Resource res; for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - modifier_->setStrokeOpacity(node_, &value); + res = Converter::ArkValue(value); + modifier_->setStrokeOpacity(node_, &res); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_OPACITY_NAME); EXPECT_EQ(checkVal, expectVal); diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp index ec5f539077f..23d95c14ba3 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp @@ -59,9 +59,9 @@ static const std::vector TEST_COLOR_PLAN = { { Converter::ArkValue(ArkUnion("#11223344")), "#11223344" }, { Converter::ArkValue(ArkUnion("65535")), "#FF00FFFF" }, { Converter::ArkValue(CreateResourceUnion(RES_NAME)), - EXPECTED_RESOURCE_COLOR }, + EXPECTED_RESOURCE_COLOR }, { Converter::ArkValue(CreateResourceUnion(RES_ID)), - EXPECTED_RESOURCE_COLOR }, + EXPECTED_RESOURCE_COLOR }, }; } // namespace @@ -138,7 +138,7 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeLineCapTestValidValues, TestSiz { std::unique_ptr jsonValue; std::string resultStr; - + // Initial setup auto inputValueStrokeLineCap = Converter::ArkValue(ARK_LINE_CAP_STYLE_BUTT); diff --git a/test/unittest/capi/modifiers/counter_modifier_test.cpp b/test/unittest/capi/modifiers/counter_modifier_test.cpp index bf7d0c48821..2abd2f95b33 100644 --- a/test/unittest/capi/modifiers/counter_modifier_test.cpp +++ b/test/unittest/capi/modifiers/counter_modifier_test.cpp @@ -252,22 +252,21 @@ HWTEST_F(CounterModifierTest, setWidthTestDefaultValues, TestSize.Level1) */ HWTEST_F(CounterModifierTest, setWidth0TestValidValues, TestSize.Level1) { - typedef std::pair OneTestStep; + typedef std::pair OneTestStep; static const std::vector testPlan = { - { Converter::ArkValue(2.45f), "2.45vp" }, - { Converter::ArkValue(5.0_px), "5.00px" }, - { Converter::ArkValue(22.35_px), "22.35px" }, - { Converter::ArkValue(7.0_vp), "7.00vp" }, - { Converter::ArkValue(1.65_vp), "1.65vp" }, - { Converter::ArkValue(65.0_fp), "65.00fp" }, - { Converter::ArkValue(4.3_fp), "4.30fp" }, - { Converter::ArkValue("12.00%"), "12.00%" }, - { RES_ARK_LENGTH, "10.00px" }, + { Converter::ArkValue(2.45f), "2.45vp" }, + { Converter::ArkValue(5.0_px), "5.00px" }, + { Converter::ArkValue(22.35_px), "22.35px" }, + { Converter::ArkValue(7.0_vp), "7.00vp" }, + { Converter::ArkValue(1.65_vp), "1.65vp" }, + { Converter::ArkValue(65.0_fp), "65.00fp" }, + { Converter::ArkValue(4.3_fp), "4.30fp" }, + { Converter::ArkValue("12.00%"), "12.00%" }, + { Converter::ArkValue(RES_ARK_LENGTH), "10.00px" }, }; for (const auto &[arkLength, expected]: testPlan) { - auto inputValue = Converter::ArkValue(arkLength); - commonModifier_->setWidth0(node_, &inputValue); + commonModifier_->setWidth0(node_, &arkLength); auto strResult = GetStringAttribute(node_, ATTRIBUTE_WIDTH_NAME); EXPECT_EQ(strResult, expected); } @@ -319,22 +318,21 @@ HWTEST_F(CounterModifierTest, setHeightTestDefaultValues, TestSize.Level1) */ HWTEST_F(CounterModifierTest, setHeight0TestValidValues, TestSize.Level1) { - typedef std::pair OneTestStep; + typedef std::pair OneTestStep; static const std::vector testPlan = { - { Converter::ArkValue(2.45f), "2.45vp" }, - { Converter::ArkValue(5.0_px), "5.00px" }, - { Converter::ArkValue(22.35_px), "22.35px" }, - { Converter::ArkValue(7.0_vp), "7.00vp" }, - { Converter::ArkValue(1.65_vp), "1.65vp" }, - { Converter::ArkValue(65.0_fp), "65.00fp" }, - { Converter::ArkValue(4.3_fp), "4.30fp" }, - { Converter::ArkValue("12.00%"), "12.00%" }, - { RES_ARK_LENGTH, "10.00px" }, + { Converter::ArkValue(2.45f), "2.45vp" }, + { Converter::ArkValue(5.0_px), "5.00px" }, + { Converter::ArkValue(22.35_px), "22.35px" }, + { Converter::ArkValue(7.0_vp), "7.00vp" }, + { Converter::ArkValue(1.65_vp), "1.65vp" }, + { Converter::ArkValue(65.0_fp), "65.00fp" }, + { Converter::ArkValue(4.3_fp), "4.30fp" }, + { Converter::ArkValue("12.00%"), "12.00%" }, + { Converter::ArkValue(RES_ARK_LENGTH), "10.00px" }, }; for (const auto &[arkLength, expected]: testPlan) { - auto inputValue = Converter::ArkValue(arkLength); - commonModifier_->setHeight0(node_, &inputValue); + commonModifier_->setHeight0(node_, &arkLength); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, expected); } @@ -347,19 +345,19 @@ HWTEST_F(CounterModifierTest, setHeight0TestValidValues, TestSize.Level1) */ HWTEST_F(CounterModifierTest, DISABLED_setHeight0TestInvalidValues, TestSize.Level1) { - static const std::vector testPlan = { - Converter::ArkValue(-2.45f), - Converter::ArkValue(-5.0_px), - Converter::ArkValue(-22.35_px), - Converter::ArkValue(-7.0_vp), - Converter::ArkValue(-1.65_vp), - Converter::ArkValue(-65.0_fp), - Converter::ArkValue(-4.3_fp), + static const std::vector testPlan = { + Converter::ArkValue(-2.45f), + Converter::ArkValue(-5.0_px), + Converter::ArkValue(-22.35_px), + Converter::ArkValue(-7.0_vp), + Converter::ArkValue(-1.65_vp), + Converter::ArkValue(-65.0_fp), + Converter::ArkValue(-4.3_fp), }; for (const auto &arkLength : testPlan) { - auto inputValue = Converter::ArkValue(arkLength); - commonModifier_->setHeight0(node_, &inputValue); + //auto inputValue = Converter::ArkValue(arkLength); + commonModifier_->setHeight0(node_, &arkLength); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, ATTRIBUTE_HEIGHT_DEFAULT_VALUE); } diff --git a/test/unittest/capi/modifiers/divider_modifier_test.cpp b/test/unittest/capi/modifiers/divider_modifier_test.cpp index f9d46a2f033..f330b325091 100644 --- a/test/unittest/capi/modifiers/divider_modifier_test.cpp +++ b/test/unittest/capi/modifiers/divider_modifier_test.cpp @@ -42,6 +42,20 @@ public: } }; +using OneColorStep = std::tuple; +const std::vector COLOR_TEST_PLAN = { + { Converter::ArkUnion(ARK_COLOR_WHITE), "#FFFFFFFF" }, + { { .selector = 1, .value1 = Converter::ArkValue(0x123456) }, "#FF123456" }, + { { .selector = 1, .value1 = Converter::ArkValue(0.5f) }, "#00000000" }, + { { .selector = 2, .value2 = Converter::ArkValue("#11223344") }, "#11223344" }, + { { .selector = 2, .value2 = Converter::ArkValue("65535") }, "#FF00FFFF" }, + { CreateResourceUnion(NamedResourceId{"aa.bb.cc", Converter::ResourceType::COLOR}), + "#FFFF0000" }, + { CreateResourceUnion(IntResourceId{1234, Converter::ResourceType::COLOR}), "#FFFF0000" }, + { CreateResourceUnion(NamedResourceId{"incorrect_color", Converter::ResourceType::STRING}), + "#FFFF0000" }, +}; + /** * @tc.name: DividerModifierTest001 * @tc.desc: Check the functionality of DividerModifier.setColor @@ -52,61 +66,19 @@ HWTEST_F(DividerModifierTest, DividerModifierTest001, TestSize.Level1) static const std::string PROP_NAME("color"); ASSERT_NE(modifier_->setColor, nullptr); - auto checkVal1 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal1, "#FF000000"); - Ark_ResourceColor color = Converter::ArkUnion(ARK_COLOR_WHITE); - auto optValue = Converter::ArkValue(color); - modifier_->setColor(node_, &optValue); - auto checkVal2 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal2, "#FFFFFFFF"); - - Ark_ResourceColor numberInt = { .selector = 1, .value1 = Converter::ArkValue(0x123456) }; - optValue = Converter::ArkValue(numberInt); - modifier_->setColor(node_, &optValue); - auto checkVal3 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal3, "#FF123456"); - - Ark_ResourceColor numberFlt = { .selector = 1, .value1 = Converter::ArkValue(0.5f) }; - optValue = Converter::ArkValue(numberFlt); - modifier_->setColor(node_, &optValue); - auto checkVal4 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal4, "#00000000"); - - Ark_ResourceColor strColor = { .selector = 2, .value2 = Converter::ArkValue("#11223344") }; - optValue = Converter::ArkValue(strColor); - modifier_->setColor(node_, &optValue); - auto checkVal5 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal5, "#11223344"); - - Ark_ResourceColor strNumber = { .selector = 2, .value2 = Converter::ArkValue("65535") }; - optValue = Converter::ArkValue(strNumber); - modifier_->setColor(node_, &optValue); - auto checkVal6 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal6, "#FF00FFFF"); - - auto resNameColor = CreateResourceUnion( - NamedResourceId{"aa.bb.cc", Converter::ResourceType::COLOR}); - optValue = Converter::ArkValue(resNameColor); - modifier_->setColor(node_, &optValue); - auto checkVal7 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal7, "#FFFF0000"); // Color::RED is result of mocked ThemeConstants::GetColorByName - - auto resIdColor = CreateResourceUnion(IntResourceId{1234, Converter::ResourceType::COLOR}); - optValue = Converter::ArkValue(resIdColor); - modifier_->setColor(node_, &optValue); - auto checkVal8 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal8, "#FFFF0000"); // Color::RED is result of mocked ThemeConstants::GetColor(int) + auto checkVal = GetStringAttribute(node_, PROP_NAME); + EXPECT_EQ(checkVal, "#FF000000"); - resNameColor = CreateResourceUnion( - NamedResourceId{"incorrect_color", Converter::ResourceType::STRING}); - optValue = Converter::ArkValue(resNameColor); - modifier_->setColor(node_, &optValue); - auto checkVal9 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal9, "#FFFF0000"); // Should be Color::RED, but converter from Resource works incorrect now. - // So modifier pass Color::BLACK to divider component int this case + for (const auto& [value, expectVal] : COLOR_TEST_PLAN) { + auto color = Converter::ArkValue(value); + modifier_->setColor(node_, &color); + auto fullJson = GetJsonValue(node_); + checkVal = GetStringAttribute(node_, PROP_NAME); + EXPECT_EQ(checkVal, expectVal); + } - strNumber = { .selector = 2, .value2 = Converter::ArkValue("incorrect_color") }; - optValue = Converter::ArkValue(strNumber); + Ark_ResourceColor strNumber = { .selector = 2, .value2 = Converter::ArkValue("incorrect_color") }; + auto optValue = Converter::ArkValue(strNumber); modifier_->setColor(node_, &optValue); auto checkVal10 = GetStringAttribute(node_, PROP_NAME); EXPECT_EQ(checkVal10, "#FF000000"); @@ -235,6 +207,19 @@ HWTEST_F(DividerModifierTest, DividerModifierTest004, TestSize.Level1) EXPECT_EQ(checkVal6, DEFAULT_STROKE_WIDTH); } +using OneWidthStep = std::tuple; +const std::vector WIDTH_TEST_PLAN = { + { { .selector = 0, .value0 = Converter::ArkValue(-123) }, "-123.00vp" }, + { { .selector = 0, .value0 = Converter::ArkValue(-1.23f) }, "-1.23vp" }, + { { .selector = 1, .value1 = Converter::ArkValue("-4.5px") }, "-4.50px" }, + { { .selector = 1, .value1 = Converter::ArkValue("-56vp") }, "-56.00vp" }, + { { .selector = 1, .value1 = Converter::ArkValue("undefVal") }, "0.00fp" }, + { { .selector = 1, .value1 = Converter::ArkValue("-10%") }, DEFAULT_STROKE_WIDTH}, + { { .selector = 1, .value1 = Converter::ArkValue("") }, "0.00fp" }, + { { .selector = 1, .value1 = Converter::ArkValue("qw111vp") }, "0.00vp" }, + { { .selector = 1, .value1 = Converter::ArkValue("qw111") }, "0.00fp" }, +}; + /** * @tc.name: DividerModifierTest005 * @tc.desc: Check the functionality of DividerModifier.setStrokeWidth for negative values @@ -245,61 +230,15 @@ HWTEST_F(DividerModifierTest, DividerModifierTest005, TestSize.Level1) static const std::string PROP_NAME("strokeWidth"); ASSERT_NE(modifier_->setStrokeWidth, nullptr); - auto checkVal1 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal1, DEFAULT_STROKE_WIDTH); - - Ark_Union_Number_String intNegVal = { .selector = 0, .value0 = Converter::ArkValue(-123) }; - auto optValue = Converter::ArkValue(intNegVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal2 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal2, "-123.00vp"); - - Ark_Union_Number_String floatNegVal = { .selector = 0, .value0 = Converter::ArkValue(-1.23f) }; - optValue = Converter::ArkValue(floatNegVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal3 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal3, "-1.23vp"); - - Ark_Union_Number_String pxNegVal = { .selector = 1, .value1 = Converter::ArkValue("-4.5px") }; - optValue = Converter::ArkValue(pxNegVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal4 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal4, "-4.50px"); - - Ark_Union_Number_String vpNegVal = { .selector = 1, .value1 = Converter::ArkValue("-56vp") }; - optValue = Converter::ArkValue(vpNegVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal5 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal5, "-56.00vp"); + auto checkVal = GetStringAttribute(node_, PROP_NAME); + EXPECT_EQ(checkVal, DEFAULT_STROKE_WIDTH); - Ark_Union_Number_String undefVal = { .selector = 1, .value1 = Converter::ArkValue("undefVal") }; - optValue = Converter::ArkValue(undefVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal6 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal6, "0.00fp"); - - Ark_Union_Number_String percentNegVal = { .selector = 1, .value1 = Converter::ArkValue("-10%") }; - optValue = Converter::ArkValue(percentNegVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal7 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal7, DEFAULT_STROKE_WIDTH); - - Ark_Union_Number_String emptyVal = { .selector = 1, .value1 = Converter::ArkValue("") }; - optValue = Converter::ArkValue(emptyVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal8 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal8, "0.00fp"); - - Ark_Union_Number_String invalidVal = { .selector = 1, .value1 = Converter::ArkValue("qw111vp") }; - optValue = Converter::ArkValue(invalidVal); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal9 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal9, "0.00vp"); - - Ark_Union_Number_String invalidVal2 = { .selector = 1, .value1 = Converter::ArkValue("qw111") }; - optValue = Converter::ArkValue(invalidVal2); - modifier_->setStrokeWidth(node_, &optValue); - auto checkVal10 = GetStringAttribute(node_, PROP_NAME); - EXPECT_EQ(checkVal10, "0.00fp"); + for (const auto& [value, expectVal] : WIDTH_TEST_PLAN) { + auto width = Converter::ArkValue(value); + modifier_->setStrokeWidth(node_, &width); + auto fullJson = GetJsonValue(node_); + checkVal = GetStringAttribute(node_, PROP_NAME); + EXPECT_EQ(checkVal, expectVal); + } } } // namespace OHOS::Ace::NG -- Gitee From 9b9644c4736558b4265f0bbd42503f454f1d3807 Mon Sep 17 00:00:00 2001 From: kovalevsergey Date: Tue, 20 May 2025 13:42:25 +0300 Subject: [PATCH 5/5] test restore Signed-off-by: kovalevsergey Change-Id: I01d3c0bbf928d051909c1953321d26fe481134e9 --- .../common_shape_method_modifier.cpp | 1 - ...n_shape_method_modifier_resources_test.cpp | 7 +++-- .../common_shape_method_modifier_test.cpp | 18 ++++++------ .../capi/modifiers/counter_modifier_test.cpp | 1 - .../capi/modifiers/divider_modifier_test.cpp | 28 ++++++++++--------- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp b/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp index 6e06aab2ae9..21bfe3e2918 100644 --- a/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp +++ b/frameworks/core/interfaces/native/implementation/common_shape_method_modifier.cpp @@ -132,7 +132,6 @@ void StrokeDashArrayImpl(Ark_NativePointer node, { auto frameNode = reinterpret_cast(node); CHECK_NULL_VOID(frameNode); - CHECK_NULL_VOID(value); auto dashArray = Converter::OptConvert>(*value); if (!dashArray) { // TODO: Reset value diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp index b583ecfdd3b..7b21acf1b4d 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_resources_test.cpp @@ -79,7 +79,7 @@ public: * @tc.desc: check setStrokeWidth from resource * @tc.type: FUNC */ -HWTEST_F(CommonShapeMethodModifierResourcesTest, DISABLED_setStrokeWidthTestResources, TestSize.Level1) +HWTEST_F(CommonShapeMethodModifierResourcesTest, setStrokeWidthTestResources, TestSize.Level1) { std::unique_ptr jsonValue; double result; @@ -91,6 +91,7 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, DISABLED_setStrokeWidthTestReso for (const auto &[arkLength, expected]: testPlan) { modifier_->setStrokeWidth(node_, &arkLength); + jsonValue = GetJsonValue(node_); result = GetAttrValue(jsonValue, ATTRIBUTE_STROKE_WIDTH_NAME); EXPECT_NEAR(result, expected, FLT_EPSILON); } @@ -104,9 +105,9 @@ HWTEST_F(CommonShapeMethodModifierResourcesTest, DISABLED_setStrokeWidthTestReso HWTEST_F(CommonShapeMethodModifierResourcesTest, setFillOpacityTestResources, TestSize.Level1) { std::unique_ptr jsonValue; - Opt_Union_Number_String_Resource res; + for (const auto &[value, expectVal]: UNION_NUM_STR_RES_RESOURECES_TEST_PLAN) { - res = Converter::ArkValue(value); + auto res = Converter::ArkValue(value); modifier_->setFillOpacity(node_, &res); jsonValue = GetJsonValue(node_); auto checkVal = GetAttrValue(jsonValue, ATTRIBUTE_FILL_OPACITY_NAME); diff --git a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp index 23d95c14ba3..6fcb13092c8 100644 --- a/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp +++ b/test/unittest/capi/modifiers/common_shape_method_modifier_test.cpp @@ -53,15 +53,13 @@ const auto RES_ID = IntResourceId{11111, Converter::ResourceType::COLOR}; static const std::string EXPECTED_RESOURCE_COLOR = Color::RED.ToString(); // Color::RED is result of ThemeConstants::GetColorXxxx stubs static const std::vector TEST_COLOR_PLAN = { - { Converter::ArkValue(ArkUnion(ARK_COLOR_WHITE)), "#FFFFFFFF" }, - { Converter::ArkValue(ArkUnion(0x123456)), "#FF123456" }, - { Converter::ArkValue(ArkUnion(0.5f)), "#00000000" }, - { Converter::ArkValue(ArkUnion("#11223344")), "#11223344" }, - { Converter::ArkValue(ArkUnion("65535")), "#FF00FFFF" }, - { Converter::ArkValue(CreateResourceUnion(RES_NAME)), - EXPECTED_RESOURCE_COLOR }, - { Converter::ArkValue(CreateResourceUnion(RES_ID)), - EXPECTED_RESOURCE_COLOR }, + { ArkUnion(ARK_COLOR_WHITE), "#FFFFFFFF" }, + { ArkUnion(0x123456), "#FF123456" }, + { ArkUnion(0.5f), "#00000000" }, + { ArkUnion("#11223344"), "#11223344" }, + { ArkUnion("65535"), "#FF00FFFF" }, + { CreateResourceUnion(RES_NAME), EXPECTED_RESOURCE_COLOR }, + { CreateResourceUnion(RES_ID), EXPECTED_RESOURCE_COLOR }, }; } // namespace @@ -628,7 +626,7 @@ HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashArrayTest, TestSize.Level1) * @tc.desc: Check the invalid cases for setStrokeDashArray * @tc.type: FUNC */ -HWTEST_F(CommonShapeMethodModifierTest, setStrokeDashArrayInavlidTest, TestSize.Level1) +HWTEST_F(CommonShapeMethodModifierTest, DISABLED_setStrokeDashArrayInavlidTest, TestSize.Level1) { static const std::string propName("strokeDashArray"); ASSERT_NE(modifier_->setStrokeDashArray, nullptr); diff --git a/test/unittest/capi/modifiers/counter_modifier_test.cpp b/test/unittest/capi/modifiers/counter_modifier_test.cpp index 2abd2f95b33..5bcf1b8a7b3 100644 --- a/test/unittest/capi/modifiers/counter_modifier_test.cpp +++ b/test/unittest/capi/modifiers/counter_modifier_test.cpp @@ -356,7 +356,6 @@ HWTEST_F(CounterModifierTest, DISABLED_setHeight0TestInvalidValues, TestSize.Lev }; for (const auto &arkLength : testPlan) { - //auto inputValue = Converter::ArkValue(arkLength); commonModifier_->setHeight0(node_, &arkLength); auto strResult = GetStringAttribute(node_, ATTRIBUTE_HEIGHT_NAME); EXPECT_EQ(strResult, ATTRIBUTE_HEIGHT_DEFAULT_VALUE); diff --git a/test/unittest/capi/modifiers/divider_modifier_test.cpp b/test/unittest/capi/modifiers/divider_modifier_test.cpp index f330b325091..83c0de0f7ca 100644 --- a/test/unittest/capi/modifiers/divider_modifier_test.cpp +++ b/test/unittest/capi/modifiers/divider_modifier_test.cpp @@ -45,10 +45,10 @@ public: using OneColorStep = std::tuple; const std::vector COLOR_TEST_PLAN = { { Converter::ArkUnion(ARK_COLOR_WHITE), "#FFFFFFFF" }, - { { .selector = 1, .value1 = Converter::ArkValue(0x123456) }, "#FF123456" }, - { { .selector = 1, .value1 = Converter::ArkValue(0.5f) }, "#00000000" }, - { { .selector = 2, .value2 = Converter::ArkValue("#11223344") }, "#11223344" }, - { { .selector = 2, .value2 = Converter::ArkValue("65535") }, "#FF00FFFF" }, + { Converter::ArkUnion(Converter::ArkValue(0x123456)), "#FF123456" }, + { Converter::ArkUnion(Converter::ArkValue(0.5f)), "#00000000" }, + { Converter::ArkUnion(Converter::ArkValue("#11223344")), "#11223344" }, + { Converter::ArkUnion(Converter::ArkValue("65535")), "#FF00FFFF" }, { CreateResourceUnion(NamedResourceId{"aa.bb.cc", Converter::ResourceType::COLOR}), "#FFFF0000" }, { CreateResourceUnion(IntResourceId{1234, Converter::ResourceType::COLOR}), "#FFFF0000" }, @@ -209,15 +209,17 @@ HWTEST_F(DividerModifierTest, DividerModifierTest004, TestSize.Level1) using OneWidthStep = std::tuple; const std::vector WIDTH_TEST_PLAN = { - { { .selector = 0, .value0 = Converter::ArkValue(-123) }, "-123.00vp" }, - { { .selector = 0, .value0 = Converter::ArkValue(-1.23f) }, "-1.23vp" }, - { { .selector = 1, .value1 = Converter::ArkValue("-4.5px") }, "-4.50px" }, - { { .selector = 1, .value1 = Converter::ArkValue("-56vp") }, "-56.00vp" }, - { { .selector = 1, .value1 = Converter::ArkValue("undefVal") }, "0.00fp" }, - { { .selector = 1, .value1 = Converter::ArkValue("-10%") }, DEFAULT_STROKE_WIDTH}, - { { .selector = 1, .value1 = Converter::ArkValue("") }, "0.00fp" }, - { { .selector = 1, .value1 = Converter::ArkValue("qw111vp") }, "0.00vp" }, - { { .selector = 1, .value1 = Converter::ArkValue("qw111") }, "0.00fp" }, + { Converter::ArkUnion(Converter::ArkValue(-123)), "-123.00vp" }, + { Converter::ArkUnion(Converter::ArkValue(-1.23f)), "-1.23vp" }, + { Converter::ArkUnion(Converter::ArkValue("-4.5px")), "-4.50px" }, + { Converter::ArkUnion(Converter::ArkValue("-56vp")), "-56.00vp" }, + { Converter::ArkUnion(Converter::ArkValue("undefVal")), + "0.00fp" }, + { Converter::ArkUnion(Converter::ArkValue("-10%")), + DEFAULT_STROKE_WIDTH }, + { Converter::ArkUnion(Converter::ArkValue("")), "0.00fp" }, + { Converter::ArkUnion(Converter::ArkValue("qw111vp")), "0.00vp" }, + { Converter::ArkUnion(Converter::ArkValue("qw111")), "0.00fp" }, }; /** -- Gitee