From 813913a303842ca4ca5e197b5820dc5a27d9b179 Mon Sep 17 00:00:00 2001 From: wangxiuxiu96 Date: Wed, 25 Jun 2025 11:23:22 +0800 Subject: [PATCH] fix:safetyWarning Signed-off-by: wangxiuxiu96 --- .../native/node/node_slider_modifier.cpp | 16 ++++----- .../slider/slider_modifier_test_ng.cpp | 34 +++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/frameworks/core/interfaces/native/node/node_slider_modifier.cpp b/frameworks/core/interfaces/native/node/node_slider_modifier.cpp index 999808c3a23..8d530dae470 100644 --- a/frameworks/core/interfaces/native/node/node_slider_modifier.cpp +++ b/frameworks/core/interfaces/native/node/node_slider_modifier.cpp @@ -831,10 +831,6 @@ const ArkUISliderModifier* GetSliderModifier() .resetMinResponsiveDistance = SliderModifier::ResetMinResponsiveDistance, .setOnChange = SliderModifier::SetOnChange, .resetOnChange = SliderModifier::ResetOnChange, - .setPrefix = SliderModifier::SetPrefix, - .resetPrefix = SliderModifier::ResetPrefix, - .setSuffix = SliderModifier::SetSuffix, - .resetSuffix = SliderModifier::ResetSuffix, .getBlockColor = SliderModifier::GetBlockColor, .getTrackBackgroundColor = SliderModifier::GetTrackBackgroundColor, .getSelectColor = SliderModifier::GetSelectColor, @@ -854,6 +850,10 @@ const ArkUISliderModifier* GetSliderModifier() .getEnableHapticFeedback = SliderModifier::GetEnableHapticFeedback, .setEnableHapticFeedback = SliderModifier::SetEnableHapticFeedback, .resetEnableHapticFeedback = SliderModifier::ResetEnableHapticFeedback, + .setPrefix = SliderModifier::SetPrefix, + .resetPrefix = SliderModifier::ResetPrefix, + .setSuffix = SliderModifier::SetSuffix, + .resetSuffix = SliderModifier::ResetSuffix, .setLinearTrackBackgroundColor = SliderModifier::SetLinearTrackBackgroundColor, .setLinearSelectColor = SliderModifier::SetLinearSelectColor, }; @@ -919,10 +919,6 @@ const CJUISliderModifier* GetCJUISliderModifier() .resetInteractionMode = SliderModifier::ResetInteractionMode, .setMinResponsiveDistance = SliderModifier::SetMinResponsiveDistance, .resetMinResponsiveDistance = SliderModifier::ResetMinResponsiveDistance, - .setPrefix = SliderModifier::SetPrefix, - .resetPrefix = SliderModifier::ResetPrefix, - .setSuffix = SliderModifier::SetSuffix, - .resetSuffix = SliderModifier::ResetSuffix, .getBlockColor = SliderModifier::GetBlockColor, .getTrackBackgroundColor = SliderModifier::GetTrackBackgroundColor, .getSelectColor = SliderModifier::GetSelectColor, @@ -942,6 +938,10 @@ const CJUISliderModifier* GetCJUISliderModifier() .getEnableHapticFeedback = SliderModifier::GetEnableHapticFeedback, .setEnableHapticFeedback = SliderModifier::SetEnableHapticFeedback, .resetEnableHapticFeedback = SliderModifier::ResetEnableHapticFeedback, + .setPrefix = SliderModifier::SetPrefix, + .resetPrefix = SliderModifier::ResetPrefix, + .setSuffix = SliderModifier::SetSuffix, + .resetSuffix = SliderModifier::ResetSuffix, }; CHECK_INITIALIZED_FIELDS_END(modifier, 0, 0, 0); // don't move this line diff --git a/test/unittest/core/pattern/slider/slider_modifier_test_ng.cpp b/test/unittest/core/pattern/slider/slider_modifier_test_ng.cpp index ba43337bbc7..679494bd5f5 100644 --- a/test/unittest/core/pattern/slider/slider_modifier_test_ng.cpp +++ b/test/unittest/core/pattern/slider/slider_modifier_test_ng.cpp @@ -2240,4 +2240,38 @@ HWTEST_F(SliderModifierTestNg, SliderContentModifierTest040, TestSize.Level1) */ ASSERT_EQ(sliderContentModifier.GetStepPointVec().size(), 1); } + +/** + * @tc.name: SliderContentModifierTest041 + * @tc.desc: TEST SliderContentModifier DrawStepPoint + * @tc.type: FUNC + */ +HWTEST_F(SliderModifierTestNg, SliderContentModifierTest041, TestSize.Level1) +{ + /** + * @tc.steps: step1. create frameNode and sliderContentModifier. + */ + RefPtr sliderPattern = AceType::MakeRefPtr(); + ASSERT_NE(sliderPattern, nullptr); + auto frameNode = FrameNode::CreateFrameNode(V2::SLIDER_ETS_TAG, -1, sliderPattern); + ASSERT_NE(frameNode, nullptr); + auto sliderPaintProperty = frameNode->GetPaintProperty(); + ASSERT_NE(sliderPaintProperty, nullptr); + SliderContentModifier::Parameters parameters; + SliderContentModifier sliderContentModifier(parameters, nullptr, nullptr); + Testing::MockCanvas canvas; + + /** + * @tc.steps: step2. create frameNode and sliderContentModifier. + */ + sliderContentModifier.SetHasPrefix(true); + sliderContentModifier.SetHasSuffix(true); + sliderContentModifier.SetSliderMode(SliderModel::SliderMode::NONE); + sliderContentModifier.DrawStepPoint(10.0f, 20.0f, 1, canvas, 5); + + /** + * @tc.steps: step3. Check the param value. + */ + ASSERT_EQ(sliderContentModifier.GetStepPointVec().size(), 1); +} } // namespace OHOS::Ace::NG -- Gitee