From a8da487d32514bbf39b54fb7217848453a7e6747 Mon Sep 17 00:00:00 2001 From: c00680103 Date: Wed, 6 Nov 2024 16:00:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?TDD=E7=94=A8=E4=BE=8B=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: c00680103 --- .../screen_setting_helper_test.cpp | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp index 93053c6001..eb9d29bafc 100644 --- a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp +++ b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp @@ -349,6 +349,104 @@ namespace { bool ret = screenSettingHelper.GetSettingValue(value, key); ASSERT_FALSE(ret); } + + /** + * @tc.name: RemoveInvalidChar01 + * @tc.desc: RemoveInvalidChar Test01 + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, RemoveInvalidChar01, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::string test_str = "test"; + auto ret = screenSettingHelper.RemoveInvalidChar(test_str); + ASSERT_EQ(ret, ""); + } + + /** + * @tc.name: RemoveInvalidChar02 + * @tc.desc: RemoveInvalidChar Test02 + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, RemoveInvalidChar02, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::string key = "test 2.0 ,"; + auto ret = screenSettingHelper.RemoveInvalidChar(test_str); + ASSERT_EQ(ret, " 2.0 ,"); + } + + /** + * @tc.name: SplitString + * @tc.desc: SplitString Test01 + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, SplitString01, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::vector splitValues = {"split", "test"}; + std::string input = ""; + char delimiter = ","; + auto ret = screenSettingHelper.SplitString(splitValues, input, delimiter); + ASSERT_FALSE(ret); + } + + /** + * @tc.name: SplitString + * @tc.desc: SplitString Test02 + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, SplitString02, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::vector splitValues = {}; + std::string input = "test, str"; + char delimiter = ","; + auto ret = screenSettingHelper.SplitString(splitValues, input, delimiter); + ASSERT_FALSE(ret); + } + + /** + * @tc.name: GetSettingRecoveryResolutionString + * @tc.desc: GetSettingRecoveryResolutionString Test + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, GetSettingRecoveryResolutionString, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::vector resolutionString = {}; + std::string key = "test, str"; + auto ret = screenSettingHelper.GetSettingRecoveryResolutionString(resolutionString, key); + ASSERT_FALSE(ret); + } + + /** + * @tc.name: GetSettingScreenModeString + * @tc.desc: GetSettingScreenModeString Test + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, GetSettingScreenModeString, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::vector screenModeStrings = {}; + std::string key = "test, str"; + auto ret = screenSettingHelper.GetSettingScreenModeString(screenModeStrings, key); + ASSERT_FALSE(ret); + } + + /** + * @tc.name: GetSettingRelativePositionString + * @tc.desc: GetSettingRelativePositionString Test + * @tc.type: FUNC + */ + HWTEST_F(ScreenSettingHelperTest, GetSettingRelativePositionString, Function | SmallTest | Level3) + { + ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); + std::vector screenModeStrings = {}; + std::string key = "test"; + auto ret = screenSettingHelper.GetSettingRelativePositionString(screenModeStrings, key); + ASSERT_FALSE(ret); + } } } // namespace Rosen } // namespace OHOS \ No newline at end of file From a5491d54aea263aa154d86e949fe929dc6787e9c Mon Sep 17 00:00:00 2001 From: c00680103 Date: Wed, 6 Nov 2024 18:27:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?TDD=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: c00680103 --- .../test/dms_unittest/screen_setting_helper_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp index eb9d29bafc..71defd2316 100644 --- a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp +++ b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp @@ -371,7 +371,7 @@ namespace { HWTEST_F(ScreenSettingHelperTest, RemoveInvalidChar02, Function | SmallTest | Level3) { ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); - std::string key = "test 2.0 ,"; + std::string test_str = "test 2.0 ,"; auto ret = screenSettingHelper.RemoveInvalidChar(test_str); ASSERT_EQ(ret, " 2.0 ,"); } @@ -386,7 +386,7 @@ namespace { ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); std::vector splitValues = {"split", "test"}; std::string input = ""; - char delimiter = ","; + char delimiter = ','; auto ret = screenSettingHelper.SplitString(splitValues, input, delimiter); ASSERT_FALSE(ret); } @@ -401,7 +401,7 @@ namespace { ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); std::vector splitValues = {}; std::string input = "test, str"; - char delimiter = ","; + char delimiter = ','; auto ret = screenSettingHelper.SplitString(splitValues, input, delimiter); ASSERT_FALSE(ret); } @@ -442,9 +442,9 @@ namespace { HWTEST_F(ScreenSettingHelperTest, GetSettingRelativePositionString, Function | SmallTest | Level3) { ScreenSettingHelper screenSettingHelper = ScreenSettingHelper(); - std::vector screenModeStrings = {}; + std::vector relativePositionStrings = {}; std::string key = "test"; - auto ret = screenSettingHelper.GetSettingRelativePositionString(screenModeStrings, key); + auto ret = screenSettingHelper.GetSettingRelativePositionString(relativePositionStrings, key); ASSERT_FALSE(ret); } } From fa7a4761def33f99d7fba9d6a680ec194cbb5a30 Mon Sep 17 00:00:00 2001 From: c00680103 Date: Thu, 7 Nov 2024 11:15:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?TDD=E7=94=A8=E4=BE=8B=E6=95=B4=E6=94=B902?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: c00680103 --- window_scene/test/dms_unittest/screen_setting_helper_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp index 71defd2316..839c8bb4f5 100644 --- a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp +++ b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp @@ -403,7 +403,7 @@ namespace { std::string input = "test, str"; char delimiter = ','; auto ret = screenSettingHelper.SplitString(splitValues, input, delimiter); - ASSERT_FALSE(ret); + ASSERT_TRUE(ret); } /** @@ -437,7 +437,7 @@ namespace { /** * @tc.name: GetSettingRelativePositionString * @tc.desc: GetSettingRelativePositionString Test - * @tc.type: FUNC + * @tc.type: FUNC */ HWTEST_F(ScreenSettingHelperTest, GetSettingRelativePositionString, Function | SmallTest | Level3) { From 3bbbbf9aac73f2f4ee7ad6a41db3861628d0d053 Mon Sep 17 00:00:00 2001 From: c00680103 Date: Thu, 7 Nov 2024 14:08:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E6=95=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: c00680103 --- window_scene/test/dms_unittest/screen_setting_helper_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp index 839c8bb4f5..e2cb4543c9 100644 --- a/window_scene/test/dms_unittest/screen_setting_helper_test.cpp +++ b/window_scene/test/dms_unittest/screen_setting_helper_test.cpp @@ -437,7 +437,7 @@ namespace { /** * @tc.name: GetSettingRelativePositionString * @tc.desc: GetSettingRelativePositionString Test - * @tc.type: FUNC + * @tc.type: FUNC */ HWTEST_F(ScreenSettingHelperTest, GetSettingRelativePositionString, Function | SmallTest | Level3) {