From cace7e2ac106c15a46e08d4e75f10954baf9e709 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Fri, 24 Nov 2023 15:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 Change-Id: I1d59d470d605f729dba95097f050527c637cdd33 --- .../screen_decision_center_test.cpp | 5 +- .../unittest/utils/dscreen_hidumper_test.cpp | 2 +- .../unittest/utils/dscreen_hidumper_test.h | 2 +- .../utils/dscreen_maprelation_test.cpp | 85 +++++++++++++++++++ .../test/unittest/utils/video_param_test.cpp | 36 ++++++++ 5 files changed, 127 insertions(+), 3 deletions(-) diff --git a/services/common/test/unittest/decision_center/screen_decision_center_test.cpp b/services/common/test/unittest/decision_center/screen_decision_center_test.cpp index 2fc79676..7ecc3eb4 100644 --- a/services/common/test/unittest/decision_center/screen_decision_center_test.cpp +++ b/services/common/test/unittest/decision_center/screen_decision_center_test.cpp @@ -209,8 +209,11 @@ HWTEST_F(ScreenDecisionCenterTest, ConfigureDecisionCenter_001, TestSize.Level1) HWTEST_F(ScreenDecisionCenterTest, SetJpegSurface_001, TestSize.Level1) { decision->imageJpeg_ = std::make_shared(param_); - sptr jpegSurface = IConsumerSurface::Create(); + sptr jpegSurface; int32_t ret = decision->SetJpegSurface(jpegSurface); + EXPECT_EQ(ERR_DH_SCREEN_TRANS_NULL_VALUE, ret); + jpegSurface = IConsumerSurface::Create(); + ret = decision->SetJpegSurface(jpegSurface); EXPECT_EQ(DH_SUCCESS, ret); } } // namespace DistributedHardware diff --git a/services/common/test/unittest/utils/dscreen_hidumper_test.cpp b/services/common/test/unittest/utils/dscreen_hidumper_test.cpp index 16fb4781..b3d0d82e 100644 --- a/services/common/test/unittest/utils/dscreen_hidumper_test.cpp +++ b/services/common/test/unittest/utils/dscreen_hidumper_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/common/test/unittest/utils/dscreen_hidumper_test.h b/services/common/test/unittest/utils/dscreen_hidumper_test.h index 6a980560..de85aabd 100644 --- a/services/common/test/unittest/utils/dscreen_hidumper_test.h +++ b/services/common/test/unittest/utils/dscreen_hidumper_test.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/common/test/unittest/utils/dscreen_maprelation_test.cpp b/services/common/test/unittest/utils/dscreen_maprelation_test.cpp index 888d18d5..0e033631 100644 --- a/services/common/test/unittest/utils/dscreen_maprelation_test.cpp +++ b/services/common/test/unittest/utils/dscreen_maprelation_test.cpp @@ -143,5 +143,90 @@ HWTEST_F(DScreenMapRelationTest, from_json_001, TestSize.Level1) from_json(j, jsonDScreenMapRelation); EXPECT_EQ(displayId, jsonDScreenMapRelation.GetDisplayId()); } + +/** + * @tc.name: from_json_002 + * @tc.desc: Verify the from_json function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenMapRelationTest, from_json_002, TestSize.Level1) +{ + json j; + uint64_t displayId = 1; + uint64_t screenId = 2; + DScreenMapRelation jsonDScreenMapRelation; + from_json(j, jsonDScreenMapRelation); + j[KEY_DISPLAY_ID] = displayId; + from_json(j, jsonDScreenMapRelation); + j[KEY_SCREEN_ID] = screenId; + from_json(j, jsonDScreenMapRelation); + j[KEY_DISPLAY_RECT] = 2; + from_json(j, jsonDScreenMapRelation); + DisplayRect displayRect = {0, 0, 100, 100}; + j[KEY_SCREEN_ID] = displayRect; + from_json(j, jsonDScreenMapRelation); + EXPECT_EQ(displayId, jsonDScreenMapRelation.GetDisplayId()); +} + +/** + * @tc.name: from_json_003 + * @tc.desc: Verify the from_json function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenMapRelationTest, from_json_003, TestSize.Level1) +{ + json j; + int32_t startX = 1; + int32_t startY = 2; + int32_t width = 3; + int32_t height = 4; + DisplayRect displayRect; + from_json(j, displayRect); + EXPECT_EQ(0, displayRect.startX); + j[KEY_POINT_START_X] = startX; + from_json(j, displayRect); + EXPECT_EQ(0, displayRect.startX); + j[KEY_POINT_START_Y] = startY; + from_json(j, displayRect); + EXPECT_EQ(0, displayRect.startY); + j[KEY_WIDTH] = width; + from_json(j, displayRect); + EXPECT_EQ(0, displayRect.width); + j[KEY_HEIGHT] = height; + from_json(j, displayRect); + EXPECT_EQ(height, displayRect.height); +} + +/** + * @tc.name: from_json_004 + * @tc.desc: Verify the from_json function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(DScreenMapRelationTest, from_json_004, TestSize.Level1) +{ + json j; + int32_t startX = 1; + int32_t startY = 2; + uint32_t width = 3; + uint32_t height = 4; + ScreenRect screenRect; + from_json(j, screenRect); + EXPECT_EQ(0, screenRect.startX); + j[KEY_POINT_START_X] = startX; + from_json(j, screenRect); + EXPECT_EQ(0, screenRect.startX); + j[KEY_POINT_START_Y] = startY; + from_json(j, screenRect); + EXPECT_EQ(0, screenRect.startY); + j[KEY_WIDTH] = width; + from_json(j, screenRect); + EXPECT_EQ(0, screenRect.width); + j[KEY_HEIGHT] = height; + from_json(j, screenRect); + EXPECT_EQ(height, screenRect.height); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/common/test/unittest/utils/video_param_test.cpp b/services/common/test/unittest/utils/video_param_test.cpp index dd1fe823..2f5dbfe4 100644 --- a/services/common/test/unittest/utils/video_param_test.cpp +++ b/services/common/test/unittest/utils/video_param_test.cpp @@ -194,5 +194,41 @@ HWTEST_F(VideoParamTest, from_json_001, TestSize.Level1) from_json(j, jsonVideoParam); EXPECT_EQ(videoWidth, jsonVideoParam.GetVideoWidth()); } + +/** + * @tc.name: from_json_002 + * @tc.desc: Verify the from_json function. + * @tc.type: FUNC + * @tc.require: Issue Number + */ +HWTEST_F(VideoParamTest, from_json_002, TestSize.Level1) +{ + json j; + uint32_t screenWidth = 200; + uint32_t screenHeight = 200; + uint32_t videoWidth = 200; + uint32_t videoHeight = 200; + uint32_t fps = 30; + uint8_t codecType = DEFAULT_CODECTYPE; + uint8_t videoFormat = DEFAULT_VIDEO_FORMAT; + VideoParam jsonVideoParam; + jsonVideoParam.isPartialRefresh_ = true; + from_json(j, jsonVideoParam); + j[KEY_SCREEN_WIDTH] = screenWidth; + from_json(j, jsonVideoParam); + j[KEY_SCREEN_HEIGHT] = screenHeight; + from_json(j, jsonVideoParam); + j[KEY_VIDEO_WIDTH] = videoWidth; + from_json(j, jsonVideoParam); + j[KEY_VIDEO_HEIGHT] = videoHeight; + from_json(j, jsonVideoParam); + j[KEY_FPS] = fps; + from_json(j, jsonVideoParam); + j[KEY_CODECTYPE] = codecType; + from_json(j, jsonVideoParam); + j[KEY_COLOR_FORMAT] = videoFormat; + from_json(j, jsonVideoParam); + EXPECT_EQ(false, jsonVideoParam.isPartialRefresh_); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee